add checks to fix 4.3 tests