diff --git a/klipper/autotests/CMakeLists.txt b/klipper/autotests/CMakeLists.txt
index 07966faed..290dc5adf 100644
--- a/klipper/autotests/CMakeLists.txt
+++ b/klipper/autotests/CMakeLists.txt
@@ -31,7 +31,6 @@ ecm_mark_as_test(testHistory)
 ########################################################
 set(testHistoryModel_SRCS
     historymodeltest.cpp
-    modeltest.cpp
     ../historymodel.cpp
     ../historyimageitem.cpp
     ../historyitem.cpp
diff --git a/klipper/autotests/historymodeltest.cpp b/klipper/autotests/historymodeltest.cpp
index 516fcd054..313e6020c 100644
--- a/klipper/autotests/historymodeltest.cpp
+++ b/klipper/autotests/historymodeltest.cpp
@@ -16,12 +16,12 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *********************************************************************/
-#include "modeltest.h"
 #include "../historymodel.h"
 #include "../historyimageitem.h"
 #include "../historystringitem.h"
 #include "../historyurlitem.h"
 
+#include <QAbstractItemModelTester>
 #include <QtTest>
 
 class HistoryModelTest : public QObject
@@ -39,7 +39,7 @@ private Q_SLOTS:
 void HistoryModelTest::testSetMaxSize()
 {
     QScopedPointer<HistoryModel> history(new HistoryModel(nullptr));
-    QScopedPointer<ModelTest> modelTest(new ModelTest(history.data()));
+    QScopedPointer<QAbstractItemModelTester> modelTest(new QAbstractItemModelTester(history.data()));
 
     QCOMPARE(history->rowCount(), 0);
     QCOMPARE(history->maxSize(), 0);
@@ -77,7 +77,7 @@ void HistoryModelTest::testSetMaxSize()
 void HistoryModelTest::testInsertRemove()
 {
     QScopedPointer<HistoryModel> history(new HistoryModel(nullptr));
-    QScopedPointer<ModelTest> modelTest(new ModelTest(history.data()));
+    QScopedPointer<QAbstractItemModelTester> modelTest(new QAbstractItemModelTester(history.data()));
     history->setMaxSize(10);
     QCOMPARE(history->rowCount(), 0);
 
@@ -178,7 +178,7 @@ void HistoryModelTest::testInsertRemove()
 void HistoryModelTest::testClear()
 {
     QScopedPointer<HistoryModel> history(new HistoryModel(nullptr));
-    QScopedPointer<ModelTest> modelTest(new ModelTest(history.data()));
+    QScopedPointer<QAbstractItemModelTester> modelTest(new QAbstractItemModelTester(history.data()));
     history->setMaxSize(10);
     QCOMPARE(history->rowCount(), 0);
 
@@ -200,7 +200,7 @@ void HistoryModelTest::testClear()
 void HistoryModelTest::testIndexOf()
 {
     QScopedPointer<HistoryModel> history(new HistoryModel(nullptr));
-    QScopedPointer<ModelTest> modelTest(new ModelTest(history.data()));
+    QScopedPointer<QAbstractItemModelTester> modelTest(new QAbstractItemModelTester(history.data()));
     history->setMaxSize(10);
     QCOMPARE(history->rowCount(), 0);
     QVERIFY(!history->indexOf(QByteArrayLiteral("whatever")).isValid());
@@ -234,7 +234,7 @@ void HistoryModelTest::testType_data()
 void HistoryModelTest::testType()
 {
     QScopedPointer<HistoryModel> history(new HistoryModel(nullptr));
-    QScopedPointer<ModelTest> modelTest(new ModelTest(history.data()));
+    QScopedPointer<QAbstractItemModelTester> modelTest(new QAbstractItemModelTester(history.data()));
     history->setMaxSize(10);
     QCOMPARE(history->rowCount(), 0);
 
diff --git a/klipper/autotests/modeltest.cpp b/klipper/autotests/modeltest.cpp
deleted file mode 100644
index 7bcc1a97b..000000000
--- a/klipper/autotests/modeltest.cpp
+++ /dev/null
@@ -1,600 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see https://www.qt.io/licensing.  For further information
-** use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: https://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-
-#include <QtGui>
-
-#include "modeltest.h"
-
-#include <QtTest>
-
-/*!
-    Connect to all of the models signals.  Whenever anything happens recheck everything.
-*/
-ModelTest::ModelTest ( QAbstractItemModel *_model, QObject *parent ) : QObject ( parent ), model ( _model ), fetchingMore ( false )
-{
-    if (!model)
-        qFatal("%s: model must not be null", Q_FUNC_INFO);
-
-    connect(model, &QAbstractItemModel::columnsAboutToBeInserted,
-            this, &ModelTest::runAllTests );
-    connect(model, &QAbstractItemModel::columnsAboutToBeRemoved,
-            this, &ModelTest::runAllTests );
-    connect(model, &QAbstractItemModel::columnsInserted,
-            this, &ModelTest::runAllTests );
-    connect(model, &QAbstractItemModel::columnsRemoved,
-            this, &ModelTest::runAllTests );
-    connect(model, &QAbstractItemModel::dataChanged,
-            this, &ModelTest::runAllTests );
-    connect(model, &QAbstractItemModel::headerDataChanged,
-            this, &ModelTest::runAllTests );
-    connect(model, &QAbstractItemModel::layoutAboutToBeChanged, this, &ModelTest::runAllTests );
-    connect(model, &QAbstractItemModel::layoutChanged, this, &ModelTest::runAllTests );
-    connect(model, &QAbstractItemModel::modelReset, this, &ModelTest::runAllTests );
-    connect(model, &QAbstractItemModel::rowsAboutToBeInserted,
-            this, &ModelTest::runAllTests );
-    connect(model, &QAbstractItemModel::rowsAboutToBeRemoved,
-            this, &ModelTest::runAllTests );
-    connect(model, &QAbstractItemModel::rowsInserted,
-            this, &ModelTest::runAllTests );
-    connect(model, &QAbstractItemModel::rowsRemoved,
-            this, &ModelTest::runAllTests );
-
-    // Special checks for changes
-    connect(model, &QAbstractItemModel::layoutAboutToBeChanged,
-            this, &ModelTest::layoutAboutToBeChanged );
-    connect(model, &QAbstractItemModel::layoutChanged,
-            this, &ModelTest::layoutChanged );
-
-    connect(model, &QAbstractItemModel::rowsAboutToBeInserted,
-            this, &ModelTest::rowsAboutToBeInserted );
-    connect(model, &QAbstractItemModel::rowsAboutToBeRemoved,
-            this, &ModelTest::rowsAboutToBeRemoved );
-    connect(model, &QAbstractItemModel::rowsInserted,
-            this, &ModelTest::rowsInserted );
-    connect(model, &QAbstractItemModel::rowsRemoved,
-            this, &ModelTest::rowsRemoved );
-    connect(model, &QAbstractItemModel::dataChanged,
-            this, &ModelTest::dataChanged );
-    connect(model, &QAbstractItemModel::headerDataChanged,
-            this, &ModelTest::headerDataChanged );
-
-    runAllTests();
-}
-
-void ModelTest::runAllTests()
-{
-    if ( fetchingMore )
-        return;
-    nonDestructiveBasicTest();
-    rowCount();
-    columnCount();
-    hasIndex();
-    index();
-    parent();
-    data();
-}
-
-/*!
-    nonDestructiveBasicTest tries to call a number of the basic functions (not all)
-    to make sure the model doesn't outright segfault, testing the functions that makes sense.
-*/
-void ModelTest::nonDestructiveBasicTest()
-{
-    QVERIFY( model->buddy ( QModelIndex() ) == QModelIndex() );
-    model->canFetchMore ( QModelIndex() );
-    QVERIFY( model->columnCount ( QModelIndex() ) >= 0 );
-    QVERIFY( model->data ( QModelIndex() ) == QVariant() );
-    fetchingMore = true;
-    model->fetchMore ( QModelIndex() );
-    fetchingMore = false;
-    Qt::ItemFlags flags = model->flags ( QModelIndex() );
-    QVERIFY( flags == Qt::ItemIsDropEnabled || flags == 0 );
-    model->hasChildren ( QModelIndex() );
-    model->hasIndex ( 0, 0 );
-    model->headerData ( 0, Qt::Horizontal );
-    model->index ( 0, 0 );
-    model->itemData ( QModelIndex() );
-    QVariant cache;
-    model->match ( QModelIndex(), -1, cache );
-    model->mimeTypes();
-    QVERIFY( model->parent ( QModelIndex() ) == QModelIndex() );
-    QVERIFY( model->rowCount() >= 0 );
-    QVariant variant;
-    model->setData ( QModelIndex(), variant, -1 );
-    model->setHeaderData ( -1, Qt::Horizontal, QVariant() );
-    model->setHeaderData ( 999999, Qt::Horizontal, QVariant() );
-    QMap<int, QVariant> roles;
-    model->sibling ( 0, 0, QModelIndex() );
-    model->span ( QModelIndex() );
-    model->supportedDropActions();
-}
-
-/*!
-    Tests model's implementation of QAbstractItemModel::rowCount() and hasChildren()
-
-    Models that are dynamically populated are not as fully tested here.
- */
-void ModelTest::rowCount()
-{
-//     qDebug() << "rc";
-    // check top row
-    QModelIndex topIndex = model->index ( 0, 0, QModelIndex() );
-    int rows = model->rowCount ( topIndex );
-    QVERIFY( rows >= 0 );
-    if ( rows > 0 )
-        QVERIFY( model->hasChildren ( topIndex ) );
-
-    QModelIndex secondLevelIndex = model->index ( 0, 0, topIndex );
-    if ( secondLevelIndex.isValid() ) { // not the top level
-        // check a row count where parent is valid
-        rows = model->rowCount ( secondLevelIndex );
-        QVERIFY( rows >= 0 );
-        if ( rows > 0 )
-            QVERIFY( model->hasChildren ( secondLevelIndex ) );
-    }
-
-    // The models rowCount() is tested more extensively in checkChildren(),
-    // but this catches the big mistakes
-}
-
-/*!
-    Tests model's implementation of QAbstractItemModel::columnCount() and hasChildren()
- */
-void ModelTest::columnCount()
-{
-    // check top row
-    QModelIndex topIndex = model->index ( 0, 0, QModelIndex() );
-    QVERIFY( model->columnCount ( topIndex ) >= 0 );
-
-    // check a column count where parent is valid
-    QModelIndex childIndex = model->index ( 0, 0, topIndex );
-    if ( childIndex.isValid() )
-        QVERIFY( model->columnCount ( childIndex ) >= 0 );
-
-    // columnCount() is tested more extensively in checkChildren(),
-    // but this catches the big mistakes
-}
-
-/*!
-    Tests model's implementation of QAbstractItemModel::hasIndex()
- */
-void ModelTest::hasIndex()
-{
-//     qDebug() << "hi";
-    // Make sure that invalid values returns an invalid index
-    QVERIFY( !model->hasIndex ( -2, -2 ) );
-    QVERIFY( !model->hasIndex ( -2, 0 ) );
-    QVERIFY( !model->hasIndex ( 0, -2 ) );
-
-    int rows = model->rowCount();
-    int columns = model->columnCount();
-
-    // check out of bounds
-    QVERIFY( !model->hasIndex ( rows, columns ) );
-    QVERIFY( !model->hasIndex ( rows + 1, columns + 1 ) );
-
-    if ( rows > 0 )
-        QVERIFY( model->hasIndex ( 0, 0 ) );
-
-    // hasIndex() is tested more extensively in checkChildren(),
-    // but this catches the big mistakes
-}
-
-/*!
-    Tests model's implementation of QAbstractItemModel::index()
- */
-void ModelTest::index()
-{
-//     qDebug() << "i";
-    // Make sure that invalid values returns an invalid index
-    QVERIFY( model->index ( -2, -2 ) == QModelIndex() );
-    QVERIFY( model->index ( -2, 0 ) == QModelIndex() );
-    QVERIFY( model->index ( 0, -2 ) == QModelIndex() );
-
-    int rows = model->rowCount();
-    int columns = model->columnCount();
-
-    if ( rows == 0 )
-        return;
-
-    // Catch off by one errors
-    QVERIFY( model->index ( rows, columns ) == QModelIndex() );
-    QVERIFY( model->index ( 0, 0 ).isValid() );
-
-    // Make sure that the same index is *always* returned
-    QModelIndex a = model->index ( 0, 0 );
-    QModelIndex b = model->index ( 0, 0 );
-    QVERIFY( a == b );
-
-    // index() is tested more extensively in checkChildren(),
-    // but this catches the big mistakes
-}
-
-/*!
-    Tests model's implementation of QAbstractItemModel::parent()
- */
-void ModelTest::parent()
-{
-//     qDebug() << "p";
-    // Make sure the model won't crash and will return an invalid QModelIndex
-    // when asked for the parent of an invalid index.
-    QVERIFY( model->parent ( QModelIndex() ) == QModelIndex() );
-
-    if ( model->rowCount() == 0 )
-        return;
-
-    // Column 0                | Column 1    |
-    // QModelIndex()           |             |
-    //    \- topIndex          | topIndex1   |
-    //         \- childIndex   | childIndex1 |
-
-    // Common error test #1, make sure that a top level index has a parent
-    // that is a invalid QModelIndex.
-    QModelIndex topIndex = model->index ( 0, 0, QModelIndex() );
-    QVERIFY( model->parent ( topIndex ) == QModelIndex() );
-
-    // Common error test #2, make sure that a second level index has a parent
-    // that is the first level index.
-    if ( model->rowCount ( topIndex ) > 0 ) {
-        QModelIndex childIndex = model->index ( 0, 0, topIndex );
-        QVERIFY( model->parent ( childIndex ) == topIndex );
-    }
-
-    // Common error test #3, the second column should NOT have the same children
-    // as the first column in a row.
-    // Usually the second column shouldn't have children.
-    QModelIndex topIndex1 = model->index ( 0, 1, QModelIndex() );
-    if ( model->rowCount ( topIndex1 ) > 0 ) {
-        QModelIndex childIndex = model->index ( 0, 0, topIndex );
-        QModelIndex childIndex1 = model->index ( 0, 0, topIndex1 );
-        QVERIFY( childIndex != childIndex1 );
-    }
-
-    // Full test, walk n levels deep through the model making sure that all
-    // parent's children correctly specify their parent.
-    checkChildren ( QModelIndex() );
-}
-
-/*!
-    Called from the parent() test.
-
-    A model that returns an index of parent X should also return X when asking
-    for the parent of the index.
-
-    This recursive function does pretty extensive testing on the whole model in an
-    effort to catch edge cases.
-
-    This function assumes that rowCount(), columnCount() and index() already work.
-    If they have a bug it will point it out, but the above tests should have already
-    found the basic bugs because it is easier to figure out the problem in
-    those tests then this one.
- */
-void ModelTest::checkChildren ( const QModelIndex &parent, int currentDepth )
-{
-    // First just try walking back up the tree.
-    QModelIndex p = parent;
-    while ( p.isValid() )
-        p = p.parent();
-
-    // For models that are dynamically populated
-    if ( model->canFetchMore ( parent ) ) {
-        fetchingMore = true;
-        model->fetchMore ( parent );
-        fetchingMore = false;
-    }
-
-    int rows = model->rowCount ( parent );
-    int columns = model->columnCount ( parent );
-
-    if ( rows > 0 )
-        QVERIFY( model->hasChildren ( parent ) );
-
-    // Some further testing against rows(), columns(), and hasChildren()
-    QVERIFY( rows >= 0 );
-    QVERIFY( columns >= 0 );
-    if ( rows > 0 )
-        QVERIFY( model->hasChildren ( parent ) );
-
-    //qDebug() << "parent:" << model->data(parent).toString() << "rows:" << rows
-    //         << "columns:" << columns << "parent column:" << parent.column();
-
-    const QModelIndex topLeftChild = model->index( 0, 0, parent );
-
-    QVERIFY( !model->hasIndex ( rows + 1, 0, parent ) );
-    for ( int r = 0; r < rows; ++r ) {
-        if ( model->canFetchMore ( parent ) ) {
-            fetchingMore = true;
-            model->fetchMore ( parent );
-            fetchingMore = false;
-        }
-        QVERIFY( !model->hasIndex ( r, columns + 1, parent ) );
-        for ( int c = 0; c < columns; ++c ) {
-            QVERIFY( model->hasIndex ( r, c, parent ) );
-            QModelIndex index = model->index ( r, c, parent );
-            // rowCount() and columnCount() said that it existed...
-            QVERIFY( index.isValid() );
-
-            // index() should always return the same index when called twice in a row
-            QModelIndex modifiedIndex = model->index ( r, c, parent );
-            QVERIFY( index == modifiedIndex );
-
-            // Make sure we get the same index if we request it twice in a row
-            QModelIndex a = model->index ( r, c, parent );
-            QModelIndex b = model->index ( r, c, parent );
-            QVERIFY( a == b );
-
-            {
-                const QModelIndex sibling = model->sibling( r, c, topLeftChild );
-                QVERIFY( index == sibling );
-            }
-            {
-                const QModelIndex sibling = topLeftChild.sibling( r, c );
-                QVERIFY( index == sibling );
-            }
-
-            // Some basic checking on the index that is returned
-            QVERIFY( index.model() == model );
-            QCOMPARE( index.row(), r );
-            QCOMPARE( index.column(), c );
-            // While you can technically return a QVariant usually this is a sign
-            // of a bug in data().  Disable if this really is ok in your model.
-//            QVERIFY( model->data ( index, Qt::DisplayRole ).isValid() );
-
-            // If the next test fails here is some somewhat useful debug you play with.
-
-            if (model->parent(index) != parent) {
-                qDebug() << r << c << currentDepth << model->data(index).toString()
-                         << model->data(parent).toString();
-                qDebug() << index << parent << model->parent(index);
-//                 And a view that you can even use to show the model.
-//                 QTreeView view;
-//                 view.setModel(model);
-//                 view.show();
-            }
-
-            // Check that we can get back our real parent.
-            QCOMPARE( model->parent ( index ), parent );
-
-            // recursively go down the children
-            if ( model->hasChildren ( index ) && currentDepth < 10 ) {
-                //qDebug() << r << c << "has children" << model->rowCount(index);
-                checkChildren ( index, ++currentDepth );
-            }/* else { if (currentDepth >= 10) qDebug() << "checked 10 deep"; };*/
-
-            // make sure that after testing the children that the index doesn't change.
-            QModelIndex newerIndex = model->index ( r, c, parent );
-            QVERIFY( index == newerIndex );
-        }
-    }
-}
-
-/*!
-    Tests model's implementation of QAbstractItemModel::data()
- */
-void ModelTest::data()
-{
-    // Invalid index should return an invalid qvariant
-    QVERIFY( !model->data ( QModelIndex() ).isValid() );
-
-    if ( model->rowCount() == 0 )
-        return;
-
-    // A valid index should have a valid QVariant data
-    QVERIFY( model->index ( 0, 0 ).isValid() );
-
-    // shouldn't be able to set data on an invalid index
-    QVERIFY( !model->setData ( QModelIndex(), QLatin1String ( "foo" ), Qt::DisplayRole ) );
-
-    // General Purpose roles that should return a QString
-    QVariant variant = model->data ( model->index ( 0, 0 ), Qt::ToolTipRole );
-    if ( variant.isValid() ) {
-        QVERIFY( variant.canConvert<QString>() );
-    }
-    variant = model->data ( model->index ( 0, 0 ), Qt::StatusTipRole );
-    if ( variant.isValid() ) {
-        QVERIFY( variant.canConvert<QString>() );
-    }
-    variant = model->data ( model->index ( 0, 0 ), Qt::WhatsThisRole );
-    if ( variant.isValid() ) {
-        QVERIFY( variant.canConvert<QString>() );
-    }
-
-    // General Purpose roles that should return a QSize
-    variant = model->data ( model->index ( 0, 0 ), Qt::SizeHintRole );
-    if ( variant.isValid() ) {
-        QVERIFY( variant.canConvert<QSize>() );
-    }
-
-    // General Purpose roles that should return a QFont
-    QVariant fontVariant = model->data ( model->index ( 0, 0 ), Qt::FontRole );
-    if ( fontVariant.isValid() ) {
-        QVERIFY( fontVariant.canConvert<QFont>() );
-    }
-
-    // Check that the alignment is one we know about
-    QVariant textAlignmentVariant = model->data ( model->index ( 0, 0 ), Qt::TextAlignmentRole );
-    if ( textAlignmentVariant.isValid() ) {
-        unsigned int alignment = textAlignmentVariant.toUInt();
-        QCOMPARE( alignment, ( alignment & ( Qt::AlignHorizontal_Mask | Qt::AlignVertical_Mask ) ) );
-    }
-
-    // General Purpose roles that should return a QColor
-    QVariant colorVariant = model->data ( model->index ( 0, 0 ), Qt::BackgroundRole );
-    if ( colorVariant.isValid() ) {
-        QVERIFY( colorVariant.canConvert<QColor>() );
-    }
-
-    colorVariant = model->data ( model->index ( 0, 0 ), Qt::ForegroundRole );
-    if ( colorVariant.isValid() ) {
-        QVERIFY( colorVariant.canConvert<QColor>() );
-    }
-
-    // Check that the "check state" is one we know about.
-    QVariant checkStateVariant = model->data ( model->index ( 0, 0 ), Qt::CheckStateRole );
-    if ( checkStateVariant.isValid() ) {
-        int state = checkStateVariant.toInt();
-        QVERIFY( state == Qt::Unchecked ||
-                 state == Qt::PartiallyChecked ||
-                 state == Qt::Checked );
-    }
-}
-
-/*!
-    Store what is about to be inserted to make sure it actually happens
-
-    \sa rowsInserted()
- */
-void ModelTest::rowsAboutToBeInserted ( const QModelIndex &parent, int start, int /* end */)
-{
-//     Q_UNUSED(end);
-//    qDebug() << "rowsAboutToBeInserted" << "start=" << start << "end=" << end << "parent=" << model->data ( parent ).toString()
-//    << "current count of parent=" << model->rowCount ( parent ); // << "display of last=" << model->data( model->index(start-1, 0, parent) );
-//     qDebug() << model->index(start-1, 0, parent) << model->data( model->index(start-1, 0, parent) );
-    Changing c;
-    c.parent = parent;
-    c.oldSize = model->rowCount ( parent );
-    c.last = model->data ( model->index ( start - 1, 0, parent ) );
-    c.next = model->data ( model->index ( start, 0, parent ) );
-    insert.push ( c );
-}
-
-/*!
-    Confirm that what was said was going to happen actually did
-
-    \sa rowsAboutToBeInserted()
- */
-void ModelTest::rowsInserted ( const QModelIndex & parent, int start, int end )
-{
-    Changing c = insert.pop();
-    QVERIFY( c.parent == parent );
-//    qDebug() << "rowsInserted"  << "start=" << start << "end=" << end << "oldsize=" << c.oldSize
-//    << "parent=" << model->data ( parent ).toString() << "current rowcount of parent=" << model->rowCount ( parent );
-
-//    for (int ii=start; ii <= end; ii++)
-//    {
-//      qDebug() << "itemWasInserted:" << ii << model->data ( model->index ( ii, 0, parent ));
-//    }
-//    qDebug();
-
-    QVERIFY( c.oldSize + ( end - start + 1 ) == model->rowCount ( parent ) );
-    QVERIFY( c.last == model->data ( model->index ( start - 1, 0, c.parent ) ) );
-
-    if (c.next != model->data(model->index(end + 1, 0, c.parent))) {
-        qDebug() << start << end;
-        for (int i=0; i < model->rowCount(); ++i)
-            qDebug() << model->index(i, 0).data().toString();
-        qDebug() << c.next << model->data(model->index(end + 1, 0, c.parent));
-    }
-
-    QVERIFY( c.next == model->data ( model->index ( end + 1, 0, c.parent ) ) );
-}
-
-void ModelTest::layoutAboutToBeChanged()
-{
-    for ( int i = 0; i < qBound ( 0, model->rowCount(), 100 ); ++i )
-        changing.append ( QPersistentModelIndex ( model->index ( i, 0 ) ) );
-}
-
-void ModelTest::layoutChanged()
-{
-    for ( int i = 0; i < changing.count(); ++i ) {
-        QPersistentModelIndex p = changing[i];
-        QVERIFY( p == model->index ( p.row(), p.column(), p.parent() ) );
-    }
-    changing.clear();
-}
-
-/*!
-    Store what is about to be inserted to make sure it actually happens
-
-    \sa rowsRemoved()
- */
-void ModelTest::rowsAboutToBeRemoved ( const QModelIndex &parent, int start, int end )
-{
-qDebug() << "ratbr" << parent << start << end;
-    Changing c;
-    c.parent = parent;
-    c.oldSize = model->rowCount ( parent );
-    c.last = model->data ( model->index ( start - 1, 0, parent ) );
-    c.next = model->data ( model->index ( end + 1, 0, parent ) );
-    remove.push ( c );
-}
-
-/*!
-    Confirm that what was said was going to happen actually did
-
-    \sa rowsAboutToBeRemoved()
- */
-void ModelTest::rowsRemoved ( const QModelIndex & parent, int start, int end )
-{
-  qDebug() << "rr" << parent << start << end;
-    Changing c = remove.pop();
-    QVERIFY( c.parent == parent );
-    QVERIFY( c.oldSize - ( end - start + 1 ) == model->rowCount ( parent ) );
-    QVERIFY( c.last == model->data ( model->index ( start - 1, 0, c.parent ) ) );
-    QVERIFY( c.next == model->data ( model->index ( start, 0, c.parent ) ) );
-}
-
-void ModelTest::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight)
-{
-    QVERIFY(topLeft.isValid());
-    QVERIFY(bottomRight.isValid());
-    QModelIndex commonParent = bottomRight.parent();
-    QVERIFY(topLeft.parent() == commonParent);
-    QVERIFY(topLeft.row() <= bottomRight.row());
-    QVERIFY(topLeft.column() <= bottomRight.column());
-    int rowCount = model->rowCount(commonParent);
-    int columnCount = model->columnCount(commonParent);
-    QVERIFY(bottomRight.row() < rowCount);
-    QVERIFY(bottomRight.column() < columnCount);
-}
-
-void ModelTest::headerDataChanged(Qt::Orientation orientation, int start, int end)
-{
-    QVERIFY(start >= 0);
-    QVERIFY(end >= 0);
-    QVERIFY(start <= end);
-    int itemCount = orientation == Qt::Vertical ? model->rowCount() : model->columnCount();
-    QVERIFY(start < itemCount);
-    QVERIFY(end < itemCount);
-}
-
diff --git a/klipper/autotests/modeltest.h b/klipper/autotests/modeltest.h
deleted file mode 100644
index 3a7d83cd5..000000000
--- a/klipper/autotests/modeltest.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see https://qt.io/licensing.  For further information
-** use the contact form at https://qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: https://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-
-#ifndef MODELTEST_H
-#define MODELTEST_H
-
-#include <QObject>
-#include <QAbstractItemModel>
-#include <QStack>
-
-class ModelTest : public QObject
-{
-  Q_OBJECT
-
-public:
-  ModelTest( QAbstractItemModel *model, QObject *parent = nullptr );
-
-private Q_SLOTS:
-  void nonDestructiveBasicTest();
-  void rowCount();
-  void columnCount();
-  void hasIndex();
-  void index();
-  void parent();
-  void data();
-
-protected Q_SLOTS:
-  void runAllTests();
-  void layoutAboutToBeChanged();
-  void layoutChanged();
-  void rowsAboutToBeInserted( const QModelIndex &parent, int start, int end );
-  void rowsInserted( const QModelIndex & parent, int start, int end );
-  void rowsAboutToBeRemoved( const QModelIndex &parent, int start, int end );
-  void rowsRemoved( const QModelIndex & parent, int start, int end );
-  void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight);
-  void headerDataChanged(Qt::Orientation orientation, int start, int end);
-
-private:
-  void checkChildren( const QModelIndex &parent, int currentDepth = 0 );
-
-  QAbstractItemModel *model;
-
-  struct Changing {
-    QModelIndex parent;
-    int oldSize;
-    QVariant last;
-    QVariant next;
-  };
-  QStack<Changing> insert;
-  QStack<Changing> remove;
-
-  bool fetchingMore;
-
-  QList<QPersistentModelIndex> changing;
-};
-
-#endif