Improve activation controller, change activation link, refactor tests