Potential patch for unit test failures in api build