Added remaining services tests.