removing calls to bind from tests as well