Merge "Add null check for tests" into main