fix #2957. fix unit tests by re-enabling multiple bindings.
remove trailing spaces