updated tests
Merged