Various fixes and removed test for new admin email address as it does not work