Fixed tests
Fixed merge