more reasonable names in client, shell tests skeletons added