Add Server Tests