services tests added

get rid of git conflicts