remove commented code
add tests and fix the implementation for the reset method