ATVWGS

@verasbr This is a quite massive amount of work, because to handle duplicates over all, we have to adjust each Test and Invoke function. I've added this to our backlog...