Remove some test tags