Improved test suite speed by reducing / disabling expensive operations (#648)