Added additional tests for various services.