removed some excess crud, and added a couple more tests.