Cleans up tests.

Removes dead file and updates inheritance test.