More tests...some with regexes