Tweaks in mockable static methods