Added remaining services tests