Bit of test refactorying