Updated tests
Merge changes