Some first work on the service test.
Made some modifications to stuff so we can run line by line validation and full file validation