Cleaned up tests and removed no longer needed type adapters.