Updated with more ServerSpec tests