Removed some bad tests; fixed the janky naming thing.