Quickfix for #1001
Other failures related to #1001 added as disabled unittests