Added some wildcards to make tests more flexible