Changed tests
Merge conflict