Wildcard test fixes