added numerical ids + tests