Fix unit tests (handle non nullables better)