Cleaning up few inconsistencies in tests, simplified service definitions, simplified generator logic