Finished up the crazier wildcard cases and more tests