Cleanup and refactor the Base Generators tests