Added multi-types. Cleaned up test suite.