#5221 - fh-art tests phase 2: fhc related updates