Fixing gens and adding test.