Bug fixes + added test function for followup emails