more tests refactored.