Moved things around to add a test-suite.