added the comments for tests and checked that the tests are properly testing what it should
Merge remote-tracking branch 'upstream/master'
Merge pull request #259 from rjynn/master

added comments and made sure tests are passing