A lot of changes to get things on track, plus separated emailing into 2 tests (as it should be!).