Cross library test fixes