Updates tests and removes the _resetCount method.