Renamed files, deleted old obsolete test cases/files