review fixes + added rebind test

-changes based on Sam's review on Gitter.
You can also delete this stuff because it is inherited.