Cleanup

Fixed a typo and cleaned up the test suite.