Fixes #133 and #400 in an authoritative and awesome manner.
Fix e2e tests to run with new $bindTo structure.