Issue #192: Last fixes for complilable testinputs