Additional tests
Additional logging
Fix to prepare statement for compatibility with runtime-pig
Merge commit '69244fad451d04149b325d6e8d93da22f864f039'