Fixed tests after API change in the common lib