Fix IDs; tighter tests.