Some unit tests written
Merge remote-tracking branch 'origin/Beta' into Beta
unit tests written