add emails and more user tests
remove two stay files.