Unit testing wip (broken)
Fixed tests
Merge pull request #1 from Blacklite/unit-tesing

Unit testing...