fixed broken m3 tests after refactoring and changing decalrations to lowercase (partly)