Changes for revision of def 3.2 done and all tests updated.