Little bit of cleanup and a few more tests.