Made a few updates with some of the tests and the service class.