Added testfile & fixed wildcard support