server.id added -> tests fixed -> additional test data