Fixed bugs on tests, removed dead urls tests
Re-added email field