Service tests cleaned up.