review fixes + added rebind test

-changes based on Sam's review on Gitter.
I don't understand the wording of this todo - is it something to do, or an explanation of what the method does?