Finished 10 tests, cleaned up comments