Updated rigol and rigoltest