Merge "Fixing unit test to not rely on html markup." into jb-mr1.1-dev