Merge "Fix density tests." into jb-mr1-dev