fixes tests
Merge