Merge "Coverage and unbundling changes for runtest." into jb-mr1-dev