Add the database query tests to server_spec and remove the extra test