Consistent iD prefix in tests
Delete obsolete tests