Refactored lots of tests; added tests for Bind