Solved bugs in tests
Merging changes