Re #6366 update system tests
Re #6366 update system tests