Test for multi-case email added. User Model code cleanup