Refactor in services test (upps!!)