Merge "Adding a final suite teardown to scale tests"