Back port doc and all test updates from crypto branch