Total Reformat of Tests