Reformatting tests to pass