Fixed up a couple of things related to tests, still depending on a slightly broken version of messy2sql that needs to get fixed.