fix tests
r/m dead code