Fixed build errors in the test suite