Cleaning up contrib modules
Preparing to merge STREAMS-26
Fixed long-running test