some test fixes
down to derivatives failures