More test, and passThrough fixes