Fix delete topic tests and deadlock