Merge "Fixing unit test to not rely on html markup."