Added support for * wildcards in searches. Modified tests acoordingly