Slight cleanups to test cases.
Remove unused tests.