Fixed test: we changed the implmenetation so configured variants require the base
Cleaned up resolution results (no point in having itself there)