add support for cross reference
deactivate some tests