More tests and small fixes