Restore int/qual tests that were deleted based on code review comments
but really needed to remain.