I have completed a second pass of the entire test suite. After one more iteration I hope to have this completed. I can then move on to refactoring the test code and looking at making them work via CI.