Finished unit tests. Added Test::Unit gem to gemfile. Will need to be installed.
Merge remote-tracking branch 'origin/master'