Removed unit test option.
Merge branch 'master' into dev