Fix tests post package move
fix tests following package move
fix tests following package move