Move activity creation to data generators. Only fixing those tests failing due to removing usemodchooser preference.