Mockable static methods
PSR
Tweaks in mockable static methods