[sr-dev] git:master: test/unit: updates to unit 22