Remove tests that are no longer required. Fix other failing tests.
Remove unused code.