Subscription tests - but still wierd and with TODOs