Reworking some unit test, adding specific unbind remover.