swap m15 and m1 rate to be correct and fixed related test (fixes issue 455)