Updated tests to test new service and removed old code