Refactor test-imap
Test structure
First tests passing
Upload code
Remove grepping of tests