Fix for false positive tests
Merge pull request #238 from AndreiH/fix_false_positive

Fix for false positive tests