Ability to set custom services
Rename test