cleaning up tests a little
Merge commit 'c2c0562'