All-in-one performance test modified