Merge "Add binder tests"