diff --git a/tests/xdgtest.cpp b/tests/xdgtest.cpp
index 46a9d8a..70f1aa1 100644
--- a/tests/xdgtest.cpp
+++ b/tests/xdgtest.cpp
@@ -1,179 +1,177 @@
 /********************************************************************
 Copyright 2015  Martin Gräßlin <mgraesslin@kde.org>
 
 This library is free software; you can redistribute it and/or
 modify it under the terms of the GNU Lesser General Public
 License as published by the Free Software Foundation; either
 version 2.1 of the License, or (at your option) version 3, or any
 later version accepted by the membership of KDE e.V. (or its
 successor approved by the membership of KDE e.V.), which shall
 act as a proxy defined in Section 6 of version 3 of the license.
 
 This library is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 Lesser General Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 *********************************************************************/
 #include "../src/client/compositor.h"
 #include "../src/client/connection_thread.h"
 #include "../src/client/event_queue.h"
 #include "../src/client/registry.h"
 #include "../src/client/shadow.h"
 #include "../src/client/shell.h"
 #include "../src/client/shm_pool.h"
 #include "../src/client/surface.h"
 #include "../src/client/xdgshell.h"
 // Qt
 #include <QGuiApplication>
 #include <QImage>
 #include <QThread>
 
 using namespace KWayland::Client;
 
 class XdgTest : public QObject
 {
     Q_OBJECT
 public:
     explicit XdgTest(QObject *parent = nullptr);
     virtual ~XdgTest();
 
     void init();
 
 private:
     void setupRegistry(Registry *registry);
     void render();
     void renderPopup();
     QThread *m_connectionThread;
     ConnectionThread *m_connectionThreadObject;
     EventQueue *m_eventQueue = nullptr;
     Compositor *m_compositor = nullptr;
     ShmPool *m_shm = nullptr;
     Surface *m_surface = nullptr;
     XdgShell *m_xdgShell = nullptr;
     XdgShellSurface *m_xdgShellSurface = nullptr;
     Surface *m_popupSurface = nullptr;
     XdgShellPopup *m_xdgShellPopup = nullptr;
 };
 
 XdgTest::XdgTest(QObject *parent)
     : QObject(parent)
     , m_connectionThread(new QThread(this))
     , m_connectionThreadObject(new ConnectionThread())
 {
 }
 
 XdgTest::~XdgTest()
 {
     m_connectionThread->quit();
     m_connectionThread->wait();
     m_connectionThreadObject->deleteLater();
 }
 
 void XdgTest::init()
 {
     connect(m_connectionThreadObject, &ConnectionThread::connected, this,
         [this] {
             m_eventQueue = new EventQueue(this);
             m_eventQueue->setup(m_connectionThreadObject);
 
             Registry *registry = new Registry(this);
             setupRegistry(registry);
         },
         Qt::QueuedConnection
     );
     m_connectionThreadObject->moveToThread(m_connectionThread);
     m_connectionThread->start();
 
     m_connectionThreadObject->initConnection();
 }
 
 void XdgTest::setupRegistry(Registry *registry)
 {
     connect(registry, &Registry::compositorAnnounced, this,
         [this, registry](quint32 name, quint32 version) {
             m_compositor = registry->createCompositor(name, version, this);
         }
     );
     connect(registry, &Registry::shmAnnounced, this,
         [this, registry](quint32 name, quint32 version) {
             m_shm = registry->createShmPool(name, version, this);
         }
     );
     connect(registry, &Registry::xdgShellUnstableV6Announced, this,
         [this, registry](quint32 name, quint32 version) {
             m_xdgShell = registry->createXdgShell(name, version, this);
             m_xdgShell->setEventQueue(m_eventQueue);
         }
     );
     connect(registry, &Registry::interfacesAnnounced, this,
         [this] {
             Q_ASSERT(m_compositor);
             Q_ASSERT(m_xdgShell);
             Q_ASSERT(m_shm);
             m_surface = m_compositor->createSurface(this);
             Q_ASSERT(m_surface);
             m_xdgShellSurface = m_xdgShell->createSurface(m_surface, this);
             Q_ASSERT(m_xdgShellSurface);
             connect(m_xdgShellSurface, &XdgShellSurface::sizeChanged, this, &XdgTest::render);
             render();
 
             //create popup
             m_popupSurface = m_compositor->createSurface(this);
 
             XdgPositioner positioner(QSize(50,50), QRect(100,100, 20, 20));
-            //DAVE pass seat info like the v5 did
             m_xdgShellPopup = m_xdgShell->createPopup(m_popupSurface, m_xdgShellSurface, positioner, this);
             renderPopup();
-            //connect size changed
         }
     );
     registry->setEventQueue(m_eventQueue);
     registry->create(m_connectionThreadObject);
     registry->setup();
 }
 
 
 void XdgTest::render()
 {
     const QSize &size = m_xdgShellSurface->size().isValid() ? m_xdgShellSurface->size() : QSize(300, 200);
     auto buffer = m_shm->getBuffer(size, size.width() * 4).toStrongRef();
     buffer->setUsed(true);
     QImage image(buffer->address(), size.width(), size.height(), QImage::Format_ARGB32_Premultiplied);
     image.fill(QColor(255, 255, 255, 128));
 
     m_surface->attachBuffer(*buffer);
     m_surface->damage(QRect(QPoint(0, 0), size));
     m_surface->commit(Surface::CommitFlag::None);
     buffer->setUsed(false);
 }
 
 void XdgTest::renderPopup()
 {
 //     const QSize &size = m_xdgShellSurface->size().isValid() ? m_xdgShellSurface->size() : QSize(300, 200);
     QSize size(200,200);
     auto buffer = m_shm->getBuffer(size, size.width() * 4).toStrongRef();
     buffer->setUsed(true);
     QImage image(buffer->address(), size.width(), size.height(), QImage::Format_ARGB32_Premultiplied);
     image.fill(QColor(255, 0, 0, 255));
 
     m_popupSurface->attachBuffer(*buffer);
     m_popupSurface->damage(QRect(QPoint(0, 0), size));
     m_popupSurface->commit(Surface::CommitFlag::None);
     buffer->setUsed(false);
 }
 
 
 
 int main(int argc, char **argv)
 {
     QCoreApplication app(argc, argv);
     XdgTest client;
     client.init();
 
     return app.exec();
 }
 
 #include "xdgtest.moc"