Fix deprecation: mut_null() -> null_mut()
Merge branch 'fix-tests'