Chore features

6 new tests. (they all pass all the time now)