Minor comments/tests/improvemetns