WIP Refactoring tests