Further improvements for C23 tests