Temp test refactors - WIP