fixing tests after wildcard mess