Fixed delete for email to make sure it is not an empty map. Also added test server and added test functions to server class