More tests
More tests
Fixed merge