Clean up o-types tests and fix some bugs.