Reformatted the Test suite