Update test files so that the test build at least compiles, tests are being updated in another branch