Fixed tests
Merged changes