Finished commenting and adding tests