Fix and unblock some tests
Merge pull request #500 from owdqa/feature/unblock_tests

Fix and unblock some tests