Merge "Fix null check tests"