Merge "aaiSubscriberController Test"