a few more tests; a commit before a fairly major rewrite of error matching