Added groups to server and added server tests