Cleanup tests a little
Version bump