change order of fmpr rnd defs
add more test code