Flush out more of the service class and it's tests.