Fixed several .inherits unit tests

Clean up