review fixes + added rebind test

-changes based on Sam's review on Gitter.
Is this relative path needed? I think you can/should delete this.