Split out single server tests