renaming tests to macht new fodler structure