StaticService extensions + Unit tests