modified unit tests for new 6.2 build