Starting actual tests
Merge pull request #27 from penguinho/master

Laying test foundation