Bettered tests, refactored.