Don't pass options to subscribe
Use original topic when finding qos of client
Cope with close event from client
Fixed test which was failing due to publishing after disconnect