Add a bunch more regular expressions and refactor some tests