Clean up each_by_level
Add another multi-level test