Add tests 7

Added tests for all classes. There may be a few more things we should test, but for now, this should be fine.