Improved service tests a little bit.