More tests fixed or disabled
Merge pull request #1103 from gannetson/feature/fix-tests

More tests fixed or disabled