Many fixes.
Modify so that these get names.
New location for gen_bunny behavior that accepts names.
Fix tests to change order.. for better testing.