Updated tests/specs and codebehind
Merge pull request #397 from alterm4nn/UnitTest-Fixes

Updated tests/specs and codebehind