[loader-v2] Small cleanups & tests (#15279)