Added a few more tests, fixed up existing tests a bit.