Merge "Clean up TOSCA provider unit tests"