More work defining services tests