Refactor formattests.cs
Two pass validation