Merge pull request #8 from beepscore/tests

Tests