Fixed skipped tests
Merge branch 'test-skip-fix'