Completely refactored the tests

Issue #12