Follow testing guidelines in refactored test names
Remove legacy test files

Tests where skipped anyway.