Fix un/subscribe tests + code
0.1.0