there was a few chunks in the testsuite that should not be part of the 
previous patch, Here is it again.