cleaned up tests and fixed up regexes