fix bind + tests