Fixes, greener SubscribeTest
Fixes regarding order of submit actions