Merge "improvement and fixes for bindings test"