Wip/warry test refactoring