Restructured unbind test to better reflect the current implementation.