Finished writing email test
Fixed merge conflicts