Add Service List.
- Move tests into integration test folder since they're closer to integration tests than unit.