Not related to this change, but since we are adding more test methods the cluster gets now recreated for each method. I think we could use `Scope.SUITE` instead of `Scope.Test` here?