Added wildcard search + unit tests