Fixed tests
Merged