Fix tests
More tests