Remove ID dependencies from tests