WIP: Failing test for reseting
Refactor: Focus on methods