removed xfail
Merge remote-tracking branch 'origin/master' into issue_165
updated according reviews
Merge pull request #181 from AndreiH/issue_165

removed xfail