@zubair-arbi I don't understand this test change. Why do we want isDirty to return isNotDirty (which should be opposites)? 

Do we still need to mock isNotDirty? I think it was probably mocked only because we used to set it directly.