More tests, fix failing tests