More tests, fixed