More fixes to test subscription parsing