ticket 7942 comment out failing tests
Merge branches 'unmaintained-test' and 'master'