Add email checking to tests
Remove commented out code
Merge pull request #252 from ratajczak/redesign

Add email checking to tests