Standardize return null; in tests