standalone tests
external id fixes