It probably makes sense to move the locking-related unit tests in oae-activity to oae-util