Adding unit tests for remaining Service class methods.