Remove obsolete tests and fix list so it works in all cases.