Vinay | #0 | Make test independent of order. Minor clean-up.