Add system & users services tests