Some rmg test fixes