use "is" for base comparison and fix unrelated test