Cleaned up typemap, started on test suite.