cleanup test runner errors and fill out build matrix