Cleaned up tests.
Merge branch 'master' of https://github.com/markohlebar/BIND