more robust test. id agnostic
minor update