Don't use rawY
Fixed tests