ActivityRecordServiceTest - need to fix transactions
merged conflicts