Fixed long standing throttle test issues