Fix command build issues in tests.