Merge "ActiveSubsciptionsListenerTest converted to junit"