Fixed variable name in log statement.
Fixed variable name in log statement.
Reorganization of test suite.
WIP: adapt tests to recent change in subscribe and import subscriptions workers.