Did some test refactors.