Fixed tests
Merge pull request #1 from nBerg/overhaul

Fixed tests