Getting rid of wildcardstest