Fixup test issue found with config.order = 'random:5549'
Unraveled another test environment cleanup bug with config.order = random:33691
Merge remote-tracking branch 'openaustralia_github/test_order_fixes' into rails-3-develop