Finish consumer conversion to new tests
Rename instance getting methods
Refactoring: pass results to the constructor
Refactoring: rename some methods