Updated tests with the new Service and Loader objects.