Tests fix, New tests, Test refactoring
Merge pull request #20 from dgRep/master

Tests fix, New tests, Test refactoring