Remove one outdated test and fix one failing test.