revert quick fix KT-3284, use workaround in test data