Added a few more tests. Touched up a few other things