Fix for failing tests
Merge pull request #41 from AndreiH/fix_asserts

Fix for failing tests