Simplify data IDs
Update test specs