More test refactoring.
Simplified tests.