minor styling changes and more explicit test for generators