configure fix (name clash), minor test code fix (backward-compat)