Fixed some binding issues and added binding testsA