Port ML tests from partial to strict