tests refactored to better fit criteria