Started to split out test code into multiple files to make it easier to see which tests are failing.