Bit more test refactoring (to get to 2.3-rc1)