Fixed unbind and adjust test.
Merge pull request #794 from Wylkon/reboot

Fixed unbind and adjust test.