Added some methods to the services for managing tests. Still a lot to do.