tests refactored down