Adjust some test names, remove obsolete and duplicate tests (nikic)