Test refactor, WIP