AQCU-1135-addition2: cleaning up unnecessary bits in tests
AQCU-1135-addition2: cleaning up unnecessary bits in tests

mhines-usgs/repgen,lindsaycarr/repgen,USGS-R/repgen,USGS-R/repgen,lindsaycarr/repgen,zmoore-usgs/repgen,lindsaycarr/repgen,zmoore-usgs/repgen,dpattermann-usgs/repgen,thongsav-usgs/repgen,mhines-usgs/repgen,dpattermann-usgs/repgen,dpattermann-usgs/repgen,zmoore-usgs/repgen,USGS-R/repgen,thongsav-usgs/repgen,thongsav-usgs/repgen,mhines-usgs/repgen