Tests setup
Merge pull request #152 from megarocks/tests

Tests setup