ADEN-697 updated topics unit tests per @gabrys