Fix ids: all tests working