Split tests into different classes
Add default values for service and type for stubbing