Custom origin is now available for sub and pub. Added test for the same.