improve reset mechanism to pass the test suite