Improved test suite

Multiple obsoletes reference