modified testextensions
conflict fixed