Mre test fixups