Added server tests and added the servers to the logic