Standardising tests for index generator against other generators
Removing unused methods
Extracted presenter factory