dry out the tests
Merge