Cleanup unit test build issues