Added unit tests for i don't know what
Merge remote-tracking branch 'origin/master'