Added Shorty
Cleanup
email test