Removed xfail and fix for test
Merge pull request #260 from AndreiH/removing_xfail_and_fix

Removed xfail and fix for test