diff --git a/libs/flake/CMakeLists.txt b/libs/flake/CMakeLists.txt
index 7511b52524..a3b3ec6bb0 100644
--- a/libs/flake/CMakeLists.txt
+++ b/libs/flake/CMakeLists.txt
@@ -1,251 +1,252 @@
 project(kritaflake)
 
 include_directories(
     ${CMAKE_SOURCE_DIR}/libs/flake/commands
     ${CMAKE_SOURCE_DIR}/libs/flake/tools
     ${CMAKE_SOURCE_DIR}/libs/flake/svg
     ${CMAKE_SOURCE_DIR}/libs/flake/text
     ${CMAKE_BINARY_DIR}/libs/flake
 )
 
 add_subdirectory(styles)
 add_subdirectory(tests)
+add_subdirectory(resources/tests)
 
 set(kritaflake_SRCS
     KoGradientHelper.cpp
     KoFlake.cpp
     KoCanvasBase.cpp
     KoResourceManager_p.cpp
     KoDerivedResourceConverter.cpp
     KoResourceUpdateMediator.cpp
     KoCanvasResourceProvider.cpp
     KoDocumentResourceManager.cpp
     KoCanvasObserverBase.cpp
     KoCanvasSupervisor.cpp
     KoDockFactoryBase.cpp
     KoDockRegistry.cpp
     KoDataCenterBase.cpp
     KoInsets.cpp
     KoPathShape.cpp
     KoPathPoint.cpp
     KoPathSegment.cpp
     KoSelection.cpp
     KoSelectedShapesProxy.cpp
     KoSelectedShapesProxySimple.cpp
     KoShape.cpp
     KoShapeAnchor.cpp
     KoShapeControllerBase.cpp
     KoShapeApplicationData.cpp
     KoShapeContainer.cpp
     KoShapeContainerModel.cpp
     KoShapeGroup.cpp
     KoShapeManager.cpp
     KoShapePaintingContext.cpp
     KoFrameShape.cpp
     KoMarker.cpp
     KoMarkerCollection.cpp
     KoToolBase.cpp
     KoCanvasController.cpp
     KoCanvasControllerWidget.cpp
     KoCanvasControllerWidgetViewport_p.cpp
     KoShapeRegistry.cpp
     KoDeferredShapeFactoryBase.cpp
     KoToolFactoryBase.cpp
     KoPathShapeFactory.cpp
     KoShapeFactoryBase.cpp
     KoShapeUserData.cpp
     KoParameterShape.cpp
     KoPointerEvent.cpp
     KoShapeController.cpp
     KoToolSelection.cpp
     KoShapeLayer.cpp
     KoPostscriptPaintDevice.cpp
     KoInputDevice.cpp
     KoToolManager_p.cpp
     KoToolManager.cpp
     KoToolRegistry.cpp
     KoToolProxy.cpp
     KoShapeSavingContext.cpp
     KoShapeLoadingContext.cpp
     KoLoadingShapeUpdater.cpp
     KoPathShapeLoader.cpp
     KoShapeStrokeModel.cpp
     KoShapeStroke.cpp
     KoShapeBackground.cpp
     KoColorBackground.cpp
     KoGradientBackground.cpp
     KoOdfGradientBackground.cpp
     KoHatchBackground.cpp
     KoPatternBackground.cpp
     KoVectorPatternBackground.cpp
     KoShapeFillWrapper.cpp
     KoShapeFillResourceConnector.cpp
     KoShapeConfigWidgetBase.cpp
     KoDrag.cpp
     KoSvgPaste.cpp
     KoDragOdfSaveHelper.cpp
     KoShapeOdfSaveHelper.cpp
     KoConnectionPoint.cpp
     KoConnectionShape.cpp
     KoConnectionShapeLoadingUpdater.cpp
     KoConnectionShapeFactory.cpp
     KoConnectionShapeConfigWidget.cpp
     KoSnapGuide.cpp
     KoSnapProxy.cpp
     KoSnapStrategy.cpp
     KoSnapData.cpp
     KoShapeShadow.cpp
     KoSharedLoadingData.cpp
     KoSharedSavingData.cpp
     KoViewConverter.cpp
     KoInputDeviceHandler.cpp
     KoInputDeviceHandlerEvent.cpp
     KoInputDeviceHandlerRegistry.cpp
     KoImageData.cpp
     KoImageData_p.cpp
     KoImageCollection.cpp
     KoOdfWorkaround.cpp
     KoFilterEffect.cpp
     KoFilterEffectStack.cpp
     KoFilterEffectFactoryBase.cpp
     KoFilterEffectRegistry.cpp
     KoFilterEffectConfigWidgetBase.cpp
     KoFilterEffectRenderContext.cpp
     KoFilterEffectLoadingContext.cpp
     KoTextShapeDataBase.cpp
     KoTosContainer.cpp
     KoTosContainerModel.cpp
     KoClipPath.cpp
     KoClipMask.cpp
     KoClipMaskPainter.cpp
     KoCurveFit.cpp
     KisGamutMaskViewConverter.cpp
 
     commands/KoShapeGroupCommand.cpp
     commands/KoShapeAlignCommand.cpp
     commands/KoShapeBackgroundCommand.cpp
     commands/KoShapeCreateCommand.cpp
     commands/KoShapeDeleteCommand.cpp
     commands/KoShapeDistributeCommand.cpp
     commands/KoShapeLockCommand.cpp
     commands/KoShapeMoveCommand.cpp
     commands/KoShapeResizeCommand.cpp
     commands/KoShapeShearCommand.cpp
     commands/KoShapeSizeCommand.cpp
     commands/KoShapeStrokeCommand.cpp
     commands/KoShapeUngroupCommand.cpp
     commands/KoShapeReorderCommand.cpp
     commands/KoShapeKeepAspectRatioCommand.cpp
     commands/KoPathBaseCommand.cpp
     commands/KoPathPointMoveCommand.cpp
     commands/KoPathControlPointMoveCommand.cpp
     commands/KoPathPointTypeCommand.cpp
     commands/KoPathPointRemoveCommand.cpp
     commands/KoPathPointInsertCommand.cpp
     commands/KoPathSegmentBreakCommand.cpp
     commands/KoPathBreakAtPointCommand.cpp
     commands/KoPathSegmentTypeCommand.cpp
     commands/KoPathCombineCommand.cpp
     commands/KoSubpathRemoveCommand.cpp
     commands/KoSubpathJoinCommand.cpp
     commands/KoParameterHandleMoveCommand.cpp
     commands/KoParameterToPathCommand.cpp
     commands/KoShapeTransformCommand.cpp
     commands/KoPathFillRuleCommand.cpp
     commands/KoConnectionShapeTypeCommand.cpp
     commands/KoShapeShadowCommand.cpp
     commands/KoPathReverseCommand.cpp
     commands/KoShapeRenameCommand.cpp
     commands/KoShapeRunAroundCommand.cpp
     commands/KoPathPointMergeCommand.cpp
     commands/KoShapeTransparencyCommand.cpp
     commands/KoShapeClipCommand.cpp
     commands/KoShapeUnclipCommand.cpp
     commands/KoPathShapeMarkerCommand.cpp
     commands/KoShapeConnectionChangeCommand.cpp
     commands/KoMultiPathPointMergeCommand.cpp
     commands/KoMultiPathPointJoinCommand.cpp
     commands/KoKeepShapesSelectedCommand.cpp
     commands/KoPathMergeUtils.cpp
 
     html/HtmlSavingContext.cpp
     html/HtmlWriter.cpp
 
     tools/KoCreateShapeStrategy.cpp
     tools/KoPathToolFactory.cpp
     tools/KoPathTool.cpp
     tools/KoPathToolSelection.cpp
     tools/KoPathToolHandle.cpp
     tools/PathToolOptionWidget.cpp
     tools/KoPathPointRubberSelectStrategy.cpp
     tools/KoPathPointMoveStrategy.cpp
     tools/KoPathConnectionPointStrategy.cpp
     tools/KoPathControlPointMoveStrategy.cpp
     tools/KoParameterChangeStrategy.cpp
     tools/KoZoomTool.cpp
     tools/KoZoomToolFactory.cpp
     tools/KoZoomToolWidget.cpp
     tools/KoZoomStrategy.cpp
     tools/KoInteractionTool.cpp
     tools/KoInteractionStrategy.cpp
     tools/KoInteractionStrategyFactory.cpp
     tools/KoCreateShapesTool.cpp
     tools/KoCreateShapesToolFactory.cpp
     tools/KoShapeRubberSelectStrategy.cpp
     tools/KoPathSegmentChangeStrategy.cpp
 
     svg/KoShapePainter.cpp
     svg/SvgUtil.cpp
     svg/SvgGraphicContext.cpp
     svg/SvgSavingContext.cpp
     svg/SvgWriter.cpp
     svg/SvgStyleWriter.cpp
     svg/SvgShape.cpp
     svg/SvgParser.cpp
     svg/SvgStyleParser.cpp
     svg/SvgGradientHelper.cpp
     svg/SvgFilterHelper.cpp
     svg/SvgCssHelper.cpp
     svg/SvgClipPathHelper.cpp
     svg/SvgLoadingContext.cpp
     svg/SvgShapeFactory.cpp
     svg/parsers/SvgTransformParser.cpp
 
     text/KoSvgText.cpp
     text/KoSvgTextProperties.cpp
     text/KoSvgTextChunkShape.cpp
     text/KoSvgTextShape.cpp
     text/KoSvgTextShapeMarkupConverter.cpp
 
     resources/KoSvgSymbolCollectionResource.cpp
     resources/KoGamutMask.cpp
 
     FlakeDebug.cpp
     tests/MockShapes.cpp
 )
 
 ki18n_wrap_ui(kritaflake_SRCS
     tools/PathToolOptionWidgetBase.ui
     KoConnectionShapeConfigWidget.ui
     tools/KoZoomToolWidget.ui
 )
 
 add_library(kritaflake SHARED ${kritaflake_SRCS})
 generate_export_header(kritaflake BASE_NAME kritaflake)
 
 target_include_directories(kritaflake
     PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/commands>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/tools>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/svg>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/text>
 )
 
 target_link_libraries(kritaflake kritapigment kritawidgetutils kritaodf kritacommand KF5::WidgetsAddons Qt5::Svg)
 
 set_target_properties(kritaflake PROPERTIES
     VERSION ${GENERIC_KRITA_LIB_VERSION} SOVERSION ${GENERIC_KRITA_LIB_SOVERSION}
 )
 
 install(TARGETS kritaflake  ${INSTALL_TARGETS_DEFAULT_ARGS})
 
diff --git a/libs/flake/KisGamutMaskViewConverter.cpp b/libs/flake/KisGamutMaskViewConverter.cpp
index dd499dfe51..0d7a7cf9b8 100644
--- a/libs/flake/KisGamutMaskViewConverter.cpp
+++ b/libs/flake/KisGamutMaskViewConverter.cpp
@@ -1,175 +1,179 @@
 /*
  *  Copyright (c) 2018 Anna Medonosova <anna.medonosova@gmail.com>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  (at your option) any later version.
  *
  *  This program 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 General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #include "KisGamutMaskViewConverter.h"
 
 #include <QPointF>
 #include <QRectF>
 #include <QSizeF>
 
+#include <kis_assert.h>
 #include <FlakeDebug.h>
 
 //#define DEBUG_GAMUT_MASK_CONVERTER
 
 KisGamutMaskViewConverter::KisGamutMaskViewConverter()
     : m_viewSize(1.0)
     , m_maskSize(QSizeF(1,1))
     , m_maskResolution(1)
 {
     computeAndSetZoom();
 }
 
 KisGamutMaskViewConverter::~KisGamutMaskViewConverter()
 {
 }
 
 QSize KisGamutMaskViewConverter::viewSize() const
 {
     return QSize(m_viewSize, m_viewSize);
 }
 
 QPointF KisGamutMaskViewConverter::documentToView(const QPointF &documentPoint) const
 {
     return QPointF(documentToViewX(documentPoint.x()), documentToViewY(documentPoint.y()));
 }
 
 
 QPointF KisGamutMaskViewConverter::viewToDocument(const QPointF &viewPoint) const
 {
     return QPointF(viewToDocumentX(viewPoint.x()), viewToDocumentY(viewPoint.y()));
 }
 
 QRectF KisGamutMaskViewConverter::documentToView(const QRectF &documentRect) const
 {
     return QRectF(documentToView(documentRect.topLeft()), documentToView(documentRect.size()));
 }
 
 QRectF KisGamutMaskViewConverter::viewToDocument(const QRectF &viewRect) const
 {
     return QRectF(viewToDocument(viewRect.topLeft()), viewToDocument(viewRect.size()));
 }
 
 QSizeF KisGamutMaskViewConverter::documentToView(const QSizeF &documentSize) const
 {
     return QSizeF(documentToViewX(documentSize.width()), documentToViewY(documentSize.height()));
 }
 
 QSizeF KisGamutMaskViewConverter::viewToDocument(const QSizeF &viewSize) const
 {
     return QSizeF(viewToDocumentX(viewSize.width()), viewToDocumentY(viewSize.height()));
 }
 
 qreal KisGamutMaskViewConverter::documentToViewX(qreal documentX) const
 {
        qreal translated = documentX * m_zoomLevel;
 
 #ifdef DEBUG_GAMUT_MASK_CONVERTER
     debugFlake << "KisGamutMaskViewConverter::DocumentToViewX: "
                << "documentX: " << documentX
                << " -> translated: " << translated;
 #endif
 
     return translated;
 }
 
 qreal KisGamutMaskViewConverter::documentToViewY(qreal documentY) const
 {   
     qreal translated = documentY * m_zoomLevel;
 
 #ifdef DEBUG_GAMUT_MASK_CONVERTER
     debugFlake << "KisGamutMaskViewConverter::DocumentToViewY: "
                << "documentY: " << documentY
                << " -> translated: " << translated;
 #endif
 
     return translated;
 }
 
 qreal KisGamutMaskViewConverter::viewToDocumentX(qreal viewX) const
 {
     qreal translated = viewX / m_zoomLevel;
 
 #ifdef DEBUG_GAMUT_MASK_CONVERTER
     debugFlake << "KisGamutMaskViewConverter::viewToDocumentX: "
                << "viewX: " << viewX
                << " -> translated: " << translated;
 #endif
 
     return translated;
 }
 
 qreal KisGamutMaskViewConverter::viewToDocumentY(qreal viewY) const
 {
     qreal translated = viewY / m_zoomLevel;
 
 #ifdef DEBUG_GAMUT_MASK_CONVERTER
        debugFlake << "KisGamutMaskViewConverter::viewToDocumentY: "
                << "viewY: " << viewY
                << " -> translated: " << translated;
 #endif
 
     return translated;
 }
 
 
 void KisGamutMaskViewConverter::setZoom(qreal zoom)
 {
     if (qFuzzyCompare(zoom, qreal(0.0)) || qFuzzyCompare(zoom, qreal(1.0))) {
         zoom = 1;
     }
 
 #ifdef DEBUG_GAMUT_MASK_CONVERTER
     debugFlake << "KisGamutMaskViewConverter::setZoom: setting to " << zoom;
 #endif
 
     m_zoomLevel = zoom;
 }
 
 void KisGamutMaskViewConverter::zoom(qreal *zoomX, qreal *zoomY) const
 {
     *zoomX = m_zoomLevel;
     *zoomY = m_zoomLevel;
 }
 
 void KisGamutMaskViewConverter::setViewSize(QSize viewSize)
 {
     m_viewSize = viewSize.width();
 
     computeAndSetZoom();
 }
 
 void KisGamutMaskViewConverter::setMaskSize(QSizeF maskSize)
 {
+    KIS_ASSERT(!qIsNull(maskSize.width()));
+    KIS_ASSERT(!qIsNull(maskSize.height()));
+
     m_maskSize = maskSize;
     m_maskResolution = maskSize.width();
 
     computeAndSetZoom();
 }
 
 void KisGamutMaskViewConverter::computeAndSetZoom()
 {
     qreal zoom = m_viewSize / m_maskResolution;
 
 #ifdef DEBUG_GAMUT_MASK_CONVERTER
     debugFlake << "KisGamutMaskViewConverter::computeAndSetZoom: "
                << "m_viewSize: " << m_viewSize
                << " m_maskSize: " << m_maskResolution;
 #endif
 
     setZoom(zoom);
 }
diff --git a/libs/flake/resources/KoGamutMask.cpp b/libs/flake/resources/KoGamutMask.cpp
index d7da355b0d..10ce479e85 100644
--- a/libs/flake/resources/KoGamutMask.cpp
+++ b/libs/flake/resources/KoGamutMask.cpp
@@ -1,428 +1,427 @@
 /*
  *  Copyright (c) 2018 Anna Medonosova <anna.medonosova@gmail.com>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  (at your option) any later version.
  *
  *  This program 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 General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #include "KoGamutMask.h"
 
 #include <cstring>
 
 #include <QVector>
 #include <QString>
 #include <QFile>
 #include <QList>
 #include <QDomDocument>
 #include <QDomElement>
 #include <QByteArray>
 #include <QBuffer>
 #include <QScopedPointer>
 
 #include <FlakeDebug.h>
 
 #include <KoStore.h>
 #include <KoStoreDevice.h>
 #include <KoDocumentResourceManager.h>
 #include <SvgParser.h>
 #include <SvgWriter.h>
 #include <KoShape.h>
 #include <KisGamutMaskViewConverter.h>
 #include <kis_assert.h>
 
-
 KoGamutMaskShape::KoGamutMaskShape(KoShape* shape)
     : m_maskShape(shape)
     , m_shapePaintingContext(KoShapePaintingContext())
 {
 }
 
 KoGamutMaskShape::KoGamutMaskShape() {};
 KoGamutMaskShape::~KoGamutMaskShape() {};
 
 KoShape* KoGamutMaskShape::koShape()
 {
     return m_maskShape;
 }
 
 bool KoGamutMaskShape::coordIsClear(const QPointF& coord, const KoViewConverter& viewConverter, int maskRotation) const
 {
     // apply mask rotation to coord
     const KisGamutMaskViewConverter& converter = dynamic_cast<const KisGamutMaskViewConverter&>(viewConverter);
     QPointF centerPoint(converter.viewSize().width()*0.5, converter.viewSize().height()*0.5);
 
     QTransform rotationTransform;
     rotationTransform.translate(centerPoint.x(), centerPoint.y());
     rotationTransform.rotate(-maskRotation);
     rotationTransform.translate(-centerPoint.x(), -centerPoint.y());
 
     QPointF rotatedCoord = rotationTransform.map(coord);
     QPointF translatedPoint = viewConverter.viewToDocument(rotatedCoord);
 
     bool isClear = m_maskShape->hitTest(translatedPoint);
 
     return isClear;
 }
 
 void KoGamutMaskShape::paint(QPainter &painter, const KoViewConverter& viewConverter, int maskRotation)
 {
     painter.save();
 
     // apply mask rotation before drawing
     QPointF centerPoint(painter.viewport().width()*0.5, painter.viewport().height()*0.5);
     painter.translate(centerPoint);
     painter.rotate(maskRotation);
     painter.translate(-centerPoint);
     painter.setTransform(m_maskShape->absoluteTransformation(&viewConverter) * painter.transform());
     m_maskShape->paint(painter, viewConverter, m_shapePaintingContext);
     painter.restore();
 }
 
 void KoGamutMaskShape::paintStroke(QPainter &painter, const KoViewConverter &viewConverter, int maskRotation)
 {
     painter.save();
 
     // apply mask rotation before drawing
     QPointF centerPoint(painter.viewport().width()*0.5, painter.viewport().height()*0.5);
     painter.translate(centerPoint);
     painter.rotate(maskRotation);
     painter.translate(-centerPoint);
 
     painter.setTransform(m_maskShape->absoluteTransformation(&viewConverter) * painter.transform());
     m_maskShape->paintStroke(painter, viewConverter, m_shapePaintingContext);
     painter.restore();
 
 }
 
 struct Q_DECL_HIDDEN KoGamutMask::Private {
     QString name;
     QString title;
     QString description;
     QByteArray data;
     QVector<KoGamutMaskShape*> maskShapes;
     QVector<KoGamutMaskShape*> previewShapes;
     QSizeF maskSize;
     int rotation;
 };
 
 KoGamutMask::KoGamutMask(const QString& filename)
     : KoResource(filename)
     , d(new Private())
 {
     d->maskSize = QSizeF(144.0,144.0);
     setRotation(0);
 }
 
 KoGamutMask::KoGamutMask()
     : KoResource(QString())
     , d(new Private())
 {
     d->maskSize = QSizeF(144.0,144.0);
     setRotation(0);
 }
 
 KoGamutMask::KoGamutMask(KoGamutMask* rhs)
     : QObject(0)
     , KoResource(QString())
     , d(new Private())
 {
     setFilename(rhs->filename());
     setTitle(rhs->title());
     setDescription(rhs->description());
     d->maskSize = rhs->d->maskSize;
 
     QList<KoShape*> newShapes;
     for(KoShape* sh: rhs->koShapes()) {
         newShapes.append(sh->cloneShape());
     }
 
     setMaskShapes(newShapes);
 
     setValid(true);
 }
 
 
 bool KoGamutMask::coordIsClear(const QPointF& coord, KoViewConverter &viewConverter, bool preview)
 {
     QVector<KoGamutMaskShape*>* shapeVector;
 
     if (preview && !d->previewShapes.isEmpty()) {
         shapeVector = &d->previewShapes;
     } else {
         shapeVector = &d->maskShapes;
     }
 
     for(KoGamutMaskShape* shape: *shapeVector) {
         if (shape->coordIsClear(coord, viewConverter, rotation()) == true) {
             return true;
         }
     }
 
     return false;
 }
 
 void KoGamutMask::paint(QPainter &painter, KoViewConverter& viewConverter, bool preview)
 {
     QVector<KoGamutMaskShape*>* shapeVector;
 
     if (preview && !d->previewShapes.isEmpty()) {
         shapeVector = &d->previewShapes;
     } else {
         shapeVector = &d->maskShapes;
     }
 
     for(KoGamutMaskShape* shape: *shapeVector) {
         shape->paint(painter, viewConverter, rotation());
     }
 }
 
 void KoGamutMask::paintStroke(QPainter &painter, KoViewConverter &viewConverter, bool preview)
 {
     QVector<KoGamutMaskShape*>* shapeVector;
 
     if (preview && !d->previewShapes.isEmpty()) {
         shapeVector = &d->previewShapes;
     } else {
         shapeVector = &d->maskShapes;
     }
 
     for(KoGamutMaskShape* shape: *shapeVector) {
         shape->paintStroke(painter, viewConverter, rotation());
     }
 }
 
 bool KoGamutMask::load()
 {
     QFile file(filename());
     if (file.size() == 0) return false;
     if (!file.open(QIODevice::ReadOnly)) {
         warnFlake << "Can't open file " << filename();
         return false;
     }
     bool res = loadFromDevice(&file);
     file.close();
     return res;
 }
 
 bool KoGamutMask::loadFromDevice(QIODevice *dev)
 {
     if (!dev->isOpen()) dev->open(QIODevice::ReadOnly);
 
     d->data = dev->readAll();
 
     // TODO: test
     KIS_ASSERT_RECOVER_RETURN_VALUE(d->data.size() != 0, false);
 
     if (filename().isNull()) {
         warnFlake << "Cannot load gamut mask" << name() << "there is no filename set";
         return false;
     }
 
     if (d->data.isNull()) {
         QFile file(filename());
         if (file.size() == 0) {
             warnFlake << "Cannot load gamut mask" << name() << "there is no data available";
             return false;
         }
 
         file.open(QIODevice::ReadOnly);
         d->data = file.readAll();
         file.close();
     }
 
     QBuffer buf(&d->data);
     buf.open(QBuffer::ReadOnly);
 
     QScopedPointer<KoStore> store(KoStore::createStore(&buf, KoStore::Read, "application/x-krita-gamutmask", KoStore::Zip));
     if (!store || store->bad()) return false;
 
     bool storeOpened = store->open("gamutmask.svg");
     if (!storeOpened) { return false; }
 
     QByteArray data;
     data.resize(store->size());
     QByteArray ba = store->read(store->size());
     store->close();
 
     QString errorMsg;
     int errorLine = 0;
     int errorColumn = 0;
 
     KoXmlDocument xmlDocument = SvgParser::createDocumentFromSvg(ba, &errorMsg, &errorLine, &errorColumn);
     if (xmlDocument.isNull()) {
 
         errorFlake << "Parsing error in " << filename() << "! Aborting!" << endl
         << " In line: " << errorLine << ", column: " << errorColumn << endl
         << " Error message: " << errorMsg << endl;
         errorFlake << "Parsing error in the main document at line" << errorLine
                    << ", column" << errorColumn << endl
                    << "Error message: " << errorMsg;
 
         return false;
     }
 
     KoDocumentResourceManager manager;
     SvgParser parser(&manager);
     parser.setResolution(QRectF(0,0,100,100), 72); // initialize with default values
     QSizeF fragmentSize;
 
     QList<KoShape*> shapes = parser.parseSvg(xmlDocument.documentElement(), &fragmentSize);
 
     d->maskSize = fragmentSize;
 
     d->title = parser.documentTitle();
     setName(d->title);
     d->description = parser.documentDescription();
 
     setMaskShapes(shapes);
 
     if (store->open("preview.png")) {
         KoStoreDevice previewDev(store.data());
         previewDev.open(QIODevice::ReadOnly);
 
         QImage preview = QImage();
         preview.load(&previewDev, "PNG");
         setImage(preview);
 
         (void)store->close();
     }
 
     buf.close();
 
     setValid(true);
 
     return true;
 }
 
 void KoGamutMask::setMaskShapes(QList<KoShape*> shapes)
 {
     setMaskShapesToVector(shapes, d->maskShapes);
 }
 
 bool KoGamutMask::save()
 {
     QFile file(filename());
     if (!file.open(QIODevice::WriteOnly | QIODevice::Truncate)) {
         return false;
     }
     saveToDevice(&file);
     file.close();
 
     return true;
 }
 
 QList<KoShape*> KoGamutMask::koShapes() const
 {
     QList<KoShape*> shapes;
     for(KoGamutMaskShape* maskShape: d->maskShapes) {
         shapes.append(maskShape->koShape());
     }
 
     return shapes;
 }
 
 bool KoGamutMask::saveToDevice(QIODevice *dev) const
 {
     KoStore* store(KoStore::createStore(dev, KoStore::Write, "application/x-krita-gamutmask", KoStore::Zip));
     if (!store || store->bad()) return false;
 
     QList<KoShape*> shapes = koShapes();
 
     std::sort(shapes.begin(), shapes.end(), KoShape::compareShapeZIndex);
 
     if (!store->open("gamutmask.svg")) {
         return false;
     }
 
     KoStoreDevice storeDev(store);
     storeDev.open(QIODevice::WriteOnly);
 
     SvgWriter writer(shapes);
     writer.setDocumentTitle(d->title);
     writer.setDocumentDescription(d->description);
 
     writer.save(storeDev, d->maskSize);
 
     if (!store->close()) { return false; }
 
 
     if (!store->open("preview.png")) {
         return false;
     }
 
     KoStoreDevice previewDev(store);
     previewDev.open(QIODevice::WriteOnly);
 
     image().save(&previewDev, "PNG");
     if (!store->close()) { return false; }
 
     return store->finalize();
 }
 
 QString KoGamutMask::title()
 {
     return d->title;
 }
 
 void KoGamutMask::setTitle(QString title)
 {
     d->title = title;
     setName(title);
 }
 
 QString KoGamutMask::description()
 {
     return d->description;
 }
 
 void KoGamutMask::setDescription(QString description)
 {
     d->description = description;
 }
 
 int KoGamutMask::rotation()
 {
     return d->rotation;
 }
 
 void KoGamutMask::setRotation(int rotation)
 {
     d->rotation = rotation;
 }
 
 QSizeF KoGamutMask::maskSize()
 {
     return d->maskSize;
 }
 
 void KoGamutMask::setPreviewMaskShapes(QList<KoShape*> shapes)
 {
     setMaskShapesToVector(shapes, d->previewShapes);
 }
 
 void KoGamutMask::setMaskShapesToVector(QList<KoShape *> shapes, QVector<KoGamutMaskShape *> &targetVector)
 {
     targetVector.clear();
 
     for(KoShape* sh: shapes) {
         KoGamutMaskShape* maskShape = new KoGamutMaskShape(sh);
         targetVector.append(maskShape);
     }
 }
 
 // clean up when ending mask preview
 void KoGamutMask::clearPreview()
 {
     d->previewShapes.clear();
 }
diff --git a/libs/flake/resources/tests/CMakeLists.txt b/libs/flake/resources/tests/CMakeLists.txt
new file mode 100644
index 0000000000..30f5bd1963
--- /dev/null
+++ b/libs/flake/resources/tests/CMakeLists.txt
@@ -0,0 +1,14 @@
+set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
+
+include(ECMAddTests)
+
+include_directories(${CMAKE_SOURCE_DIR}/sdk/tests)
+
+macro_add_unittest_definitions()
+
+# needs kritaimage for TestUtil
+ecm_add_tests(
+    KoGamutMaskTest.cpp
+#    KoGamutMaskShapeTest.cpp
+    LINK_LIBRARIES kritaflake kritaimage Qt5::Test
+    NAME_PREFIX "libs-flake-")
diff --git a/libs/flake/resources/tests/KoGamutMaskTest.cpp b/libs/flake/resources/tests/KoGamutMaskTest.cpp
new file mode 100644
index 0000000000..a7763c74e7
--- /dev/null
+++ b/libs/flake/resources/tests/KoGamutMaskTest.cpp
@@ -0,0 +1,135 @@
+/*
+ *  Copyright (c) 2019 Anna Medonosova <anna.medonosova@gmail.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program 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 General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+
+#include <QTest>
+#include <resources/KoGamutMask.h>
+#include <KisGamutMaskViewConverter.h>
+
+#include <testutil.h>
+
+#include "KoGamutMaskTest.h"
+
+KoGamutMaskTest::KoGamutMaskTest(QObject *parent) : QObject(parent)
+{
+
+}
+
+void KoGamutMaskTest::testCoordIsClear()
+{
+    QFETCH(QString, maskFile);
+    QFETCH(QPointF, coord);
+    QFETCH(int, maskRotation);
+    QFETCH(bool, expectedOutput);
+
+    QScopedPointer<KoGamutMask> mask(new KoGamutMask(TestUtil::fetchDataFileLazy(maskFile)));
+    mask->load();
+    Q_ASSERT(mask->valid());
+    mask->setRotation(maskRotation);
+
+    KisGamutMaskViewConverter* converter = new KisGamutMaskViewConverter();
+    converter->setMaskSize(mask->maskSize());
+    converter->setViewSize(QSize(100.0, 100.0));
+
+    bool maskOutput = mask->coordIsClear(coord, *converter, false);
+    QCOMPARE(maskOutput, expectedOutput);
+}
+
+void KoGamutMaskTest::testCoordIsClear_data()
+{
+    QTest::addColumn<QString>("maskFile");
+    QTest::addColumn<QPointF>("coord");
+    QTest::addColumn<int>("maskRotation");
+    QTest::addColumn<bool>("expectedOutput");
+
+    // single shape mask
+    QTest::addRow("Atmospheric_Triad.kgm: disallowed coordinate, no rotation") << "Atmospheric_Triad.kgm"
+                                                                        << QPointF(0.0, 0.0) << 0
+                                                                        << false;
+
+    QTest::addRow("Atmospheric_Triad.kgm: allowed coordinate, no rotation") << "Atmospheric_Triad.kgm"
+                                                                          << QPointF(33.0, 71.0) << 0
+                                                                          << true;
+
+    QTest::addRow("Atmospheric_Triad.kgm: disallowed coordinate, with rotation") << "Atmospheric_Triad.kgm"
+                                                                            << QPointF(33.0, 71.0) << 180
+                                                                            << false;
+
+    QTest::addRow("Atmospheric_Triad.kgm: allowed coordinate, with rotation") << "Atmospheric_Triad.kgm"
+                                                                             << QPointF(76.4,60.9) << 180
+                                                                             << true;
+
+
+    // multiple shapes mask
+    QTest::addRow("Dominant_Hue_With_Accent.kgm: allowed coordinate, shape 1, no rotation")
+            << "Dominant_Hue_With_Accent.kgm"
+            << QPointF(71.0, 49.0) << 0
+            << true;
+
+    QTest::addRow("Dominant_Hue_With_Accent.kgm: allowed coordinate, shape 2, no rotation")
+            << "Dominant_Hue_With_Accent.kgm"
+            << QPointF(11.0, 51.0) << 0
+            << true;
+
+    QTest::addRow("Dominant_Hue_With_Accent.kgm: allowed coordinate, shape 1, with rotation")
+            << "Dominant_Hue_With_Accent.kgm"
+            << QPointF(40.0, 21.0) << 256
+            << true;
+
+    QTest::addRow("Dominant_Hue_With_Accent.kgm: allowed coordinate, shape 2, with rotation")
+            << "Dominant_Hue_With_Accent.kgm"
+            << QPointF(57.0, 82.0) << 256
+            << true;
+}
+
+void KoGamutMaskTest::testLoad()
+{
+    QFETCH(QString, maskFile);
+    QFETCH(QString, expectedTitle);
+    QFETCH(QString, expectedDescription);
+    QFETCH(int, expectedShapeCount);
+
+    QScopedPointer<KoGamutMask> mask(new KoGamutMask(TestUtil::fetchDataFileLazy(maskFile)));
+    mask->load();
+
+    Q_ASSERT(mask->valid());
+
+    QCOMPARE(mask->title(), expectedTitle);
+    QCOMPARE(mask->description(), expectedDescription);
+    QCOMPARE(mask->koShapes().size(), expectedShapeCount);
+}
+
+void KoGamutMaskTest::testLoad_data()
+{
+    QTest::addColumn<QString>("maskFile");
+    QTest::addColumn<QString>("expectedTitle");
+    QTest::addColumn<QString>("expectedDescription");
+    QTest::addColumn<int>("expectedShapeCount");
+
+    QTest::addRow("single shape mask")
+            << "Atmospheric_Triad.kgm"
+            << "Atmospheric Triad" << "test gamut mask description"
+            << 1;
+
+    QTest::addRow("multiple shape mask")
+            << "Dominant_Hue_With_Accent.kgm"
+            << "Dominant Hue With Accent" << ""
+            << 2;
+}
+
+QTEST_MAIN(KoGamutMaskTest);
diff --git a/libs/flake/resources/tests/KoGamutMaskTest.h b/libs/flake/resources/tests/KoGamutMaskTest.h
new file mode 100644
index 0000000000..0af7d63331
--- /dev/null
+++ b/libs/flake/resources/tests/KoGamutMaskTest.h
@@ -0,0 +1,39 @@
+/*
+ *  Copyright (c) 2019 Anna Medonosova <anna.medonosova@gmail.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program 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 General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#ifndef KOGAMUTMASKTEST_H
+#define KOGAMUTMASKTEST_H
+
+#include <QObject>
+
+class KoGamutMaskTest : public QObject
+{
+    Q_OBJECT
+public:
+    explicit KoGamutMaskTest(QObject *parent = nullptr);
+
+private Q_SLOTS:
+    void testCoordIsClear();
+    void testCoordIsClear_data();
+
+    void testLoad();
+    void testLoad_data();
+// TODO: add preview vs. non-preview testing
+};
+
+#endif // KOGAMUTMASKTEST_H
diff --git a/libs/flake/resources/tests/data/Atmospheric_Triad.kgm b/libs/flake/resources/tests/data/Atmospheric_Triad.kgm
new file mode 100644
index 0000000000..40f30cf3b4
Binary files /dev/null and b/libs/flake/resources/tests/data/Atmospheric_Triad.kgm differ
diff --git a/libs/flake/resources/tests/data/Dominant_Hue_With_Accent.kgm b/libs/flake/resources/tests/data/Dominant_Hue_With_Accent.kgm
new file mode 100644
index 0000000000..1bfecf468e
Binary files /dev/null and b/libs/flake/resources/tests/data/Dominant_Hue_With_Accent.kgm differ
diff --git a/libs/flake/tests/CMakeLists.txt b/libs/flake/tests/CMakeLists.txt
index f2a07a9033..905eed5224 100644
--- a/libs/flake/tests/CMakeLists.txt
+++ b/libs/flake/tests/CMakeLists.txt
@@ -1,89 +1,90 @@
 set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
 
 include(ECMAddTests)
 include(KritaAddBrokenUnitTest)
 
 
 macro_add_unittest_definitions()
 
 ecm_add_tests(
     TestPosition.cpp
     TestSelection.cpp
     TestPathTool.cpp
     TestShapeAt.cpp
     TestShapePainting.cpp
     TestKoShapeFactory.cpp
     TestKoShapeRegistry.cpp
     TestShapeContainer.cpp
     TestShapeGroupCommand.cpp
     TestShapeReorderCommand.cpp
     TestImageCollection.cpp
     TestResourceManager.cpp
     TestShapeBackgroundCommand.cpp
     TestShapeStrokeCommand.cpp
     TestShapeShadowCommand.cpp
     TestInputDevice.cpp
     TestSnapStrategy.cpp
     TestPathShape.cpp
     TestControlPointMoveCommand.cpp
     TestPointTypeCommand.cpp
     TestPointRemoveCommand.cpp
     TestRemoveSubpathCommand.cpp
     TestPathSegment.cpp
     TestSegmentTypeCommand.cpp
     TestKoDrag.cpp
     TestKoMarkerCollection.cpp
+    KisGamutMaskViewConverterTest.cpp
 
     LINK_LIBRARIES kritaflake Qt5::Test
     NAME_PREFIX "libs-flake-")
 
 ecm_add_test(
     TestSvgParser.cpp
     TEST_NAME TestSvgParser
     LINK_LIBRARIES kritaflake Qt5::Test
     NAME_PREFIX "libs-flake-")
 
 ecm_add_test(
     TestSvgParser.cpp
     TEST_NAME TestSvgParserCloned
     LINK_LIBRARIES kritaflake Qt5::Test
     NAME_PREFIX "libs-flake-")
 set_property(TARGET TestSvgParserCloned
              PROPERTY COMPILE_DEFINITIONS USE_CLONED_SHAPES)
 
 ecm_add_test(
     TestSvgParser.cpp
     TEST_NAME TestSvgParserRoundTrip
     LINK_LIBRARIES kritaflake Qt5::Test
     NAME_PREFIX "libs-flake-")
 set_property(TARGET TestSvgParserRoundTrip
              PROPERTY COMPILE_DEFINITIONS USE_ROUND_TRIP)
 
 ############## broken tests ###############
 
 krita_add_broken_unit_test(TestPointMergeCommand.cpp
     TEST_NAME TestPointMergeCommand
     LINK_LIBRARIES kritaflake Qt5::Test
     NAME_PREFIX "libs-flake-")
 
 krita_add_broken_unit_test(
     TestSvgText.cpp
     TEST_NAME TestSvgText
     LINK_LIBRARIES kritaflake Qt5::Test
     NAME_PREFIX "libs-flake-")
 
 krita_add_broken_unit_test(
     TestSvgText.cpp
     TEST_NAME TestSvgTextCloned
     LINK_LIBRARIES kritaflake Qt5::Test
     NAME_PREFIX "libs-flake-")
 set_property(TARGET TestSvgTextCloned
              PROPERTY COMPILE_DEFINITIONS USE_CLONED_SHAPES)
 
 krita_add_broken_unit_test(
     TestSvgText.cpp
     TEST_NAME TestSvgTextRoundTrip
     LINK_LIBRARIES kritaflake Qt5::Test
     NAME_PREFIX "libs-flake-")
 set_property(TARGET TestSvgTextRoundTrip
              PROPERTY COMPILE_DEFINITIONS USE_ROUND_TRIP)
diff --git a/libs/flake/tests/KisGamutMaskViewConverterTest.cpp b/libs/flake/tests/KisGamutMaskViewConverterTest.cpp
new file mode 100644
index 0000000000..e3cd26ebf9
--- /dev/null
+++ b/libs/flake/tests/KisGamutMaskViewConverterTest.cpp
@@ -0,0 +1,151 @@
+/*
+ *  Copyright (c) 2019 Anna Medonosova <anna.medonosova@gmail.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program 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 General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#include <QScopedPointer>
+
+#include <KisGamutMaskViewConverter.h>
+#include <kis_assert_exception.h>
+
+#include "KisGamutMaskViewConverterTest.h"
+
+
+
+KisGamutMaskViewConverterTest::KisGamutMaskViewConverterTest(QObject *parent) : QObject(parent)
+{
+
+}
+
+void KisGamutMaskViewConverterTest::testDocumentToViewX()
+{
+    QFETCH(qreal, input);
+    QFETCH(qreal, expectedOutput);
+    QFETCH(QSizeF, maskSize);
+    QFETCH(QSize, viewSize);
+
+    QScopedPointer<KisGamutMaskViewConverter> converter(new KisGamutMaskViewConverter());
+    converter->setMaskSize(maskSize);
+    converter->setViewSize(viewSize);
+
+    qreal converterOutput = converter->documentToViewX(input);
+    QCOMPARE(converterOutput, expectedOutput);
+}
+
+void KisGamutMaskViewConverterTest::testDocumentToViewX_data()
+{
+    QTest::addColumn<qreal>("input");
+    QTest::addColumn<qreal>("expectedOutput");
+    QTest::addColumn<QSizeF>("maskSize");
+    QTest::addColumn<QSize>("viewSize");
+
+    QTest::newRow("mask < view") << 2.0 << 4.0 << QSizeF(200.0, 200.0) << QSize(400, 400);
+    QTest::newRow("view < mask") << 2.0 << 1.0 << QSizeF(400.0, 400.0) << QSize(200, 200);
+
+    QTest::newRow("view not square") << 2.0 << 4.0 << QSizeF(200.0, 300.0) << QSize(400, 400);
+    QTest::newRow("mask not square") << 2.0 << 4.0 << QSizeF(200.0, 200.0) << QSize(400, 600);
+}
+
+void KisGamutMaskViewConverterTest::testDocumentToViewY()
+{
+    QFETCH(qreal, input);
+    QFETCH(qreal, expectedOutput);
+    QFETCH(QSizeF, maskSize);
+    QFETCH(QSize, viewSize);
+
+    QScopedPointer<KisGamutMaskViewConverter> converter(new KisGamutMaskViewConverter());
+    converter->setMaskSize(maskSize);
+    converter->setViewSize(viewSize);
+
+    qreal converterOutput = converter->documentToViewY(input);
+    QCOMPARE(converterOutput, expectedOutput);
+}
+
+void KisGamutMaskViewConverterTest::testDocumentToViewY_data()
+{
+
+    QTest::addColumn<qreal>("input");
+    QTest::addColumn<qreal>("expectedOutput");
+    QTest::addColumn<QSizeF>("maskSize");
+    QTest::addColumn<QSize>("viewSize");
+
+    QTest::newRow("mask < view") << 2.0 << 4.0 << QSizeF(200.0, 200.0) << QSize(400, 400);
+    QTest::newRow("view < mask") << 2.0 << 1.0 << QSizeF(400.0, 400.0) << QSize(200, 200);
+
+    QTest::newRow("view not square") << 2.0 << 4.0 << QSizeF(200.0, 300.0) << QSize(400, 400);
+    QTest::newRow("mask not square") << 2.0 << 4.0 << QSizeF(200.0, 200.0) << QSize(400, 600);
+}
+
+void KisGamutMaskViewConverterTest::testViewToDocumentX()
+{
+    QFETCH(qreal, input);
+    QFETCH(qreal, expectedOutput);
+    QFETCH(QSizeF, maskSize);
+    QFETCH(QSize, viewSize);
+
+    QScopedPointer<KisGamutMaskViewConverter> converter(new KisGamutMaskViewConverter());
+    converter->setMaskSize(maskSize);
+    converter->setViewSize(viewSize);
+
+    qreal converterOutput = converter->viewToDocumentX(input);
+    QCOMPARE(converterOutput, expectedOutput);
+}
+
+void KisGamutMaskViewConverterTest::testViewToDocumentX_data()
+{
+    QTest::addColumn<qreal>("input");
+    QTest::addColumn<qreal>("expectedOutput");
+    QTest::addColumn<QSizeF>("maskSize");
+    QTest::addColumn<QSize>("viewSize");
+
+    QTest::newRow("mask < view") << 4.0 << 2.0 << QSizeF(200.0, 200.0) << QSize(400, 400);
+    QTest::newRow("view < mask") << 1.0 << 2.0 << QSizeF(400.0, 400.0) << QSize(200, 200);
+
+    QTest::newRow("view not square") << 4.0 << 2.0 << QSizeF(200.0, 300.0) << QSize(400, 400);
+    QTest::newRow("mask not square") << 4.0 << 2.0 << QSizeF(200.0, 200.0) << QSize(400, 600);
+}
+
+void KisGamutMaskViewConverterTest::testViewToDocumentY()
+{
+    QFETCH(qreal, input);
+    QFETCH(qreal, expectedOutput);
+    QFETCH(QSizeF, maskSize);
+    QFETCH(QSize, viewSize);
+
+    QScopedPointer<KisGamutMaskViewConverter> converter(new KisGamutMaskViewConverter());
+    converter->setMaskSize(maskSize);
+    converter->setViewSize(viewSize);
+
+    qreal converterOutput = converter->viewToDocumentY(input);
+    QCOMPARE(converterOutput, expectedOutput);
+}
+
+void KisGamutMaskViewConverterTest::testViewToDocumentY_data()
+{
+    QTest::addColumn<qreal>("input");
+    QTest::addColumn<qreal>("expectedOutput");
+    QTest::addColumn<QSizeF>("maskSize");
+    QTest::addColumn<QSize>("viewSize");
+
+
+    QTest::newRow("mask < view") << 4.0 << 2.0 << QSizeF(200.0, 200.0) << QSize(400, 400);
+    QTest::newRow("view < mask") << 1.0 << 2.0 << QSizeF(400.0, 400.0) << QSize(200, 200);
+
+    QTest::newRow("view not square") << 4.0 << 2.0 << QSizeF(200.0, 300.0) << QSize(400, 400);
+    QTest::newRow("mask not square") << 4.0 << 2.0 << QSizeF(200.0, 200.0) << QSize(400, 600);
+}
+
+QTEST_MAIN(KisGamutMaskViewConverterTest);
diff --git a/libs/flake/tests/KisGamutMaskViewConverterTest.h b/libs/flake/tests/KisGamutMaskViewConverterTest.h
new file mode 100644
index 0000000000..fdde941568
--- /dev/null
+++ b/libs/flake/tests/KisGamutMaskViewConverterTest.h
@@ -0,0 +1,45 @@
+/*
+ *  Copyright (c) 2019 Anna Medonosova <anna.medonosova@gmail.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program 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 General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#ifndef KISGAMUTMASKVIEWCONVERTERTEST_H
+#define KISGAMUTMASKVIEWCONVERTERTEST_H
+
+#include <QObject>
+#include <QTest>
+
+class KisGamutMaskViewConverterTest : public QObject
+{
+    Q_OBJECT
+public:
+    explicit KisGamutMaskViewConverterTest(QObject *parent = nullptr);
+
+private Q_SLOTS:
+    void testDocumentToViewX();
+    void testDocumentToViewX_data();
+
+    void testDocumentToViewY();
+    void testDocumentToViewY_data();
+
+    void testViewToDocumentX();
+    void testViewToDocumentX_data();
+
+    void testViewToDocumentY();
+    void testViewToDocumentY_data();
+};
+
+#endif // KISGAMUTMASKVIEWCONVERTERTEST_H
diff --git a/libs/ui/tests/CMakeLists.txt b/libs/ui/tests/CMakeLists.txt
index a800340260..99d892a829 100644
--- a/libs/ui/tests/CMakeLists.txt
+++ b/libs/ui/tests/CMakeLists.txt
@@ -1,183 +1,183 @@
 set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
 
-include_directories(${CMAKE_SOURCE_DIR}/libs/image/metadata 
+include_directories(${CMAKE_SOURCE_DIR}/libs/image/metadata
                     ${CMAKE_SOURCE_DIR}/sdk/tests )
 
 include(ECMAddTests)
 
 macro_add_unittest_definitions()
 
 ecm_add_tests(
     kis_image_view_converter_test.cpp
     kis_shape_selection_test.cpp
     kis_doc2_test.cpp
     kis_coordinates_converter_test.cpp
     kis_grid_config_test.cpp
     kis_stabilized_events_sampler_test.cpp
     kis_brush_hud_properties_config_test.cpp
     kis_shape_commands_test.cpp
     kis_shape_layer_test.cpp
     kis_stop_gradient_editor_test.cpp
     kis_file_layer_test.cpp
     kis_multinode_property_test.cpp
     KisFrameSerializerTest.cpp
     KisFrameCacheStoreTest.cpp
     kis_animation_exporter_test.cpp
     kis_prescaled_projection_test.cpp
     kis_asl_layer_style_serializer_test.cpp
     kis_animation_importer_test.cpp
     KisSpinBoxSplineUnitConverterTest.cpp
     KisDocumentReplaceTest.cpp
 
     LINK_LIBRARIES kritaui Qt5::Test
     NAME_PREFIX "libs-ui-"
 )
 
 ecm_add_test( kis_selection_decoration_test.cpp ../../../sdk/tests/stroke_testing_utils.cpp
     TEST_NAME KisSelectionDecorationTest
     LINK_LIBRARIES kritaui Qt5::Test
     NAME_PREFIX "libs-ui-")
 
 ecm_add_test( kis_node_dummies_graph_test.cpp ../../../sdk/tests/testutil.cpp
     TEST_NAME KisNodeDummiesGraphTest
     LINK_LIBRARIES kritaui Qt5::Test
     NAME_PREFIX "libs-ui-")
 
 ecm_add_test( kis_node_shapes_graph_test.cpp ../../../sdk/tests/testutil.cpp
     TEST_NAME KisNodeShapesGraphTest
     LINK_LIBRARIES kritaui Qt5::Test
     NAME_PREFIX "libs-ui-")
 
 ecm_add_test( kis_model_index_converter_test.cpp ../../../sdk/tests/testutil.cpp
     TEST_NAME KisModelIndexConverterTest
     LINK_LIBRARIES kritaui Qt5::Test
     NAME_PREFIX "libs-ui-")
 
 
 ecm_add_test( kis_categorized_list_model_test.cpp modeltest.cpp
     TEST_NAME KisCategorizedListModelTest
     LINK_LIBRARIES kritaui Qt5::Test
     NAME_PREFIX "libs-ui-")
 
 ecm_add_test( kis_node_juggler_compressed_test.cpp  ../../../sdk/tests/testutil.cpp
     TEST_NAME KisNodeJugglerCompressedTest
     LINK_LIBRARIES kritaui Qt5::Test
     NAME_PREFIX "libs-ui-")
 
 ecm_add_test(
     kis_input_manager_test.cpp ../../../sdk/tests/testutil.cpp
     TEST_NAME KisInputManagerTest
     LINK_LIBRARIES kritaui Qt5::Test
     NAME_PREFIX "libs-ui-")
 
 ecm_add_test(
     kis_node_model_test.cpp modeltest.cpp
     TEST_NAME kis_node_model_test
     LINK_LIBRARIES kritaui Qt5::Test
     NAME_PREFIX "libs-ui-")
 
 ##### Tests that currently fail and should be fixed #####
 
 include(KritaAddBrokenUnitTest)
 
 
 krita_add_broken_unit_test(
     kis_shape_controller_test.cpp kis_dummies_facade_base_test.cpp
     TEST_NAME kis_shape_controller_test
     LINK_LIBRARIES kritaui Qt5::Test
     NAME_PREFIX "libs-ui-")
 
 krita_add_broken_unit_test(
     kis_exiv2_test.cpp
     TEST_NAME KisExiv2Test
     LINK_LIBRARIES kritaui Qt5::Test
     NAME_PREFIX "libs-ui-")
 
 krita_add_broken_unit_test(
     kis_clipboard_test.cpp
     TEST_NAME KisClipboardTest
     LINK_LIBRARIES kritaui Qt5::Test
     NAME_PREFIX "libs-ui-")
 
 krita_add_broken_unit_test(
     freehand_stroke_test.cpp ${CMAKE_SOURCE_DIR}/sdk/tests/stroke_testing_utils.cpp
     TEST_NAME FreehandStrokeTest
     LINK_LIBRARIES kritaui Qt5::Test
     NAME_PREFIX "libs-ui-")
 
 krita_add_broken_unit_test(
     FreehandStrokeBenchmark.cpp ${CMAKE_SOURCE_DIR}/sdk/tests/stroke_testing_utils.cpp
     TEST_NAME FreehandStrokeBenchmark
     LINK_LIBRARIES kritaui Qt5::Test
     NAME_PREFIX "libs-ui-")
 
 krita_add_broken_unit_test(
     KisPaintOnTransparencyMaskTest.cpp ${CMAKE_SOURCE_DIR}/sdk/tests/stroke_testing_utils.cpp
     TEST_NAME KisPaintOnTransparencyMaskTest
     LINK_LIBRARIES kritaui Qt5::Test
     NAME_PREFIX "libs-ui-")
 
 ecm_add_test(
     fill_processing_visitor_test.cpp ${CMAKE_SOURCE_DIR}/sdk/tests/stroke_testing_utils.cpp
     TEST_NAME 
     FillProcessingVisitorTest
     LINK_LIBRARIES kritaui Qt5::Test
     NAME_PREFIX "libs-ui-")
 
 krita_add_broken_unit_test(
     filter_stroke_test.cpp ../../../sdk/tests/stroke_testing_utils.cpp
     TEST_NAME FilterStrokeTest
     LINK_LIBRARIES kritaui Qt5::Test
     NAME_PREFIX "libs-ui-")
 
 krita_add_broken_unit_test(
     kis_selection_manager_test.cpp
     TEST_NAME KisSelectionManagerTest
     LINK_LIBRARIES kritaui Qt5::Test
     NAME_PREFIX "libs-ui-")
 #set_tests_properties(libs-ui-KisSelectionManagerTest PROPERTIES TIMEOUT 300)
 
 krita_add_broken_unit_test(
     kis_node_manager_test.cpp
     TEST_NAME KisNodeManagerTest
     LINK_LIBRARIES kritaui Qt5::Test
     NAME_PREFIX "libs-ui-")
 
 krita_add_broken_unit_test(
     kis_dummies_facade_test.cpp kis_dummies_facade_base_test.cpp ../../../sdk/tests/testutil.cpp
     TEST_NAME KisDummiesFacadeTest
     LINK_LIBRARIES kritaui Qt5::Test
     NAME_PREFIX "libs-ui-")
 
 krita_add_broken_unit_test(
     kis_zoom_and_pan_test.cpp ../../../sdk/tests/testutil.cpp
     TEST_NAME KisZoomAndPanTest
     LINK_LIBRARIES kritaui Qt5::Test
     NAME_PREFIX "libs-ui-")
 #set_tests_properties(libs-ui-KisZoomAndPanTest PROPERTIES TIMEOUT 300)
 
 krita_add_broken_unit_test(
     kis_action_manager_test.cpp
     TEST_NAME KisActionManagerTest
     LINK_LIBRARIES kritaui Qt5::Test
     NAME_PREFIX "libs-ui-")
 
 krita_add_broken_unit_test(
     kis_categories_mapper_test.cpp testing_categories_mapper.cpp
     TEST_NAME KisCategoriesMapperTest
     LINK_LIBRARIES kritaui Qt5::Test
     NAME_PREFIX "libs-ui-")
 
 
 krita_add_broken_unit_test(
     kis_animation_frame_cache_test.cpp
     TEST_NAME kis_animation_frame_cache_test
     LINK_LIBRARIES kritaui Qt5::Test
     NAME_PREFIX "libs-ui-")
 
 
 krita_add_broken_unit_test(
     kis_derived_resources_test.cpp
     TEST_NAME kis_derived_resources_test
     LINK_LIBRARIES kritaui Qt5::Test
     NAME_PREFIX "libs-ui-")