Fix unittests, add missing allow-none