Fix some build issues with tests.