Began work on shelling out the test suite.