Add a few more tests, cleanup based on PR feedback