Removed inverse type
More unit tests