Fix and MOOORE Tests