some tests and removing email