cleaned up and expanded tests
gotten things to about the same state they were when I started, now I can start adding some more edge cases.