Merge "Allow for setting test type as a monkey." into jb-mr2-dev