Tidy up a little bit

Hi Douglas!

Schlomo told me about Megaphone. I don't wanted to write a mail bugging you about megaphone. Just tidied up a little bit and added a first functional test as example.

Best, Daniel