Services and it's tests project clean up

- Cleaned up services and it's tests project code base.
- Separated tests which had different testing purposes into two separate
tests.