Added a third unit test, and fixed some mistakes.
Merge remote-tracking branch 'origin/master'
Put quotes back in