Issue 6285 unit tests failing