Adjust rules to handle interfaces correctly - 19 failing tests