modified unit tests for new 6.2 build
Merge remote-tracking branch 'origin/master'