Test refactor WIP