Tided up tests after refactoring