DC |# 3066 | fixing tests