More tests refactored.