Cleaned up specs, fix environment mailing issues