Fixed unit testing
Merge branch 'master' into temp-build
unit testing