Fix broken tests (using fixed ids unnecessarily)