Merge "Fix dumpstate test instructions"