Merge "Reset mock NM before each of the tests that checks it" into tm-dev