Can I refactor and move all the tests the way, you have suggested within OGM-1268 Open ? eg. in as separate, 1st commit?