bind fixes and tests