Remove extra tests and extend similar topics test (again)
Fix testing errors