Tests all failing because storage isn't using ids yet, so time to force that