Mainly test refactors