WIP test refactoring