More smtp stages

Solves #21, added a test