Removed obsolete tests and updated existing tests.