Fixed unbind and adjust test.