Fixing test order