Services tests clean up

- Cleaned up services tests code base.