Initial refactor
Refactor all assertions
Merge pull request #7 from hyperoslo/refactor/tests

Refactor/tests