Restore Odin's MS-port tests for upcoming PR