Fix unit tests related to activation