You should not remove existing tests. As in the removed cases we were checking set/reset functions. So get back all tests as is with the new additions and we are good to go for merge.