user activation refactor
additional test cases