clean up global Building.* changes in test runner, fixes intermittent failure in other.test_static_link