Revised testing format