Fixed unit tests -> all tests run!
fix bug with set as default email address