Merge "Use addClassResourceCleanup in account service test"