Simplify existing builtin topic tests, and fix the name clash.