Merge "More activity tests." into jb-mr1-dev