Refactor tests bypass-activation-email