Fixing test order issue.