Add some more tests; some simple regex rules