Test refactoring.

No point in tests forcing implementation.