Services model tests rebased