fix test, backport from CoreProduct