Removed base types from the public API. More tests added