changes plus an email wrappers test.