Use correct test bed objects
Preserve order in various sets