Moses tests fixed