temp commit while I merge with kurtis
changed email on one test to greg@greg.com
merged with kurtis
changed email to use greg@greg.com