added cleanup method to the testservice class and the gmail service class