more test fixes and fixing handling of assignments with pinch hitters