Finished adding tests and comments