Change commands according to new test