Start working with binding style.
Fix falling tests.