add subscription test, fix some other tests