Replace map/orswot_eqc with quviq consulted statems

As well as ensuring correct shrinking and fixing generators
replace sets with lists for ease of reading when a counter
example is found