MDL-40541 need to be able to select random q

in unit tests
MDL-40542 need to be able to select variant

in unit tests
MDL-40542 white space changes