test fixes and validator patch