More reset refactoring
Refactor of unit tests