Fix rm test defs