Added some Unit tests... and many more will follow in time.
Merge remote-tracking branch 'origin/master'