Remove most unused files.

56 files changed, 0 insertions, 36530 deletions

diff --git a/src/unittests/catch.hpp b/src/unittests/catch.hpp
deleted file mode 100644
index 64d1cafc4..000000000
--- a/src/unittests/catch.hpp
+++ /dev/null
@@ -1,10502 +0,0 @@
-/*
- *  Catch v1.5.1
- *  Generated: 2016-04-28 08:12:37.387488
- *  ----------------------------------------------------------
- *  This file has been merged from multiple headers. Please don't edit it directly
- *  Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved.
- *
- *  Distributed under the Boost Software License, Version 1.0. (See accompanying
- *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
- */
-#ifndef TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED
-#define TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED
-
-#define TWOBLUECUBES_CATCH_HPP_INCLUDED
-
-#ifdef __clang__
-#    pragma clang system_header
-#elif defined __GNUC__
-#    pragma GCC system_header
-#endif
-
-// #included from: internal/catch_suppress_warnings.h
-
-#ifdef __clang__
-#   ifdef __ICC // icpc defines the __clang__ macro
-#       pragma warning(push)
-#       pragma warning(disable: 161 1682)
-#   else // __ICC
-#       pragma clang diagnostic ignored "-Wglobal-constructors"
-#       pragma clang diagnostic ignored "-Wvariadic-macros"
-#       pragma clang diagnostic ignored "-Wc99-extensions"
-#       pragma clang diagnostic ignored "-Wunused-variable"
-#       pragma clang diagnostic push
-#       pragma clang diagnostic ignored "-Wpadded"
-#       pragma clang diagnostic ignored "-Wc++98-compat"
-#       pragma clang diagnostic ignored "-Wc++98-compat-pedantic"
-#       pragma clang diagnostic ignored "-Wswitch-enum"
-#       pragma clang diagnostic ignored "-Wcovered-switch-default"
-#    endif
-#elif defined __GNUC__
-#    pragma GCC diagnostic ignored "-Wvariadic-macros"
-#    pragma GCC diagnostic ignored "-Wunused-variable"
-#    pragma GCC diagnostic push
-#    pragma GCC diagnostic ignored "-Wpadded"
-#endif
-#if defined(CATCH_CONFIG_MAIN) || defined(CATCH_CONFIG_RUNNER)
-#  define CATCH_IMPL
-#endif
-
-#ifdef CATCH_IMPL
-#  ifndef CLARA_CONFIG_MAIN
-#    define CLARA_CONFIG_MAIN_NOT_DEFINED
-#    define CLARA_CONFIG_MAIN
-#  endif
-#endif
-
-// #included from: internal/catch_notimplemented_exception.h
-#define TWOBLUECUBES_CATCH_NOTIMPLEMENTED_EXCEPTION_H_INCLUDED
-
-// #included from: catch_common.h
-#define TWOBLUECUBES_CATCH_COMMON_H_INCLUDED
-
-#define INTERNAL_CATCH_UNIQUE_NAME_LINE2( name, line ) name##line
-#define INTERNAL_CATCH_UNIQUE_NAME_LINE( name, line ) INTERNAL_CATCH_UNIQUE_NAME_LINE2( name, line )
-#ifdef CATCH_CONFIG_COUNTER
-#  define INTERNAL_CATCH_UNIQUE_NAME( name ) INTERNAL_CATCH_UNIQUE_NAME_LINE( name, __COUNTER__ )
-#else
-#  define INTERNAL_CATCH_UNIQUE_NAME( name ) INTERNAL_CATCH_UNIQUE_NAME_LINE( name, __LINE__ )
-#endif
-
-#define INTERNAL_CATCH_STRINGIFY2( expr ) #expr
-#define INTERNAL_CATCH_STRINGIFY( expr ) INTERNAL_CATCH_STRINGIFY2( expr )
-
-#include <sstream>
-#include <stdexcept>
-#include <algorithm>
-
-// stack
-#ifdef HAVE_EXECINFO
-#include <execinfo.h>
-#endif  // HAVE_EXECINFO
-// stack
-
-// #included from: catch_compiler_capabilities.h
-#define TWOBLUECUBES_CATCH_COMPILER_CAPABILITIES_HPP_INCLUDED
-
-// Detect a number of compiler features - mostly C++11/14 conformance - by compiler
-// The following features are defined:
-//
-// CATCH_CONFIG_CPP11_NULLPTR : is nullptr supported?
-// CATCH_CONFIG_CPP11_NOEXCEPT : is noexcept supported?
-// CATCH_CONFIG_CPP11_GENERATED_METHODS : The delete and default keywords for compiler generated methods
-// CATCH_CONFIG_CPP11_IS_ENUM : std::is_enum is supported?
-// CATCH_CONFIG_CPP11_TUPLE : std::tuple is supported
-// CATCH_CONFIG_CPP11_LONG_LONG : is long long supported?
-// CATCH_CONFIG_CPP11_OVERRIDE : is override supported?
-// CATCH_CONFIG_CPP11_UNIQUE_PTR : is unique_ptr supported (otherwise use auto_ptr)
-
-// CATCH_CONFIG_CPP11_OR_GREATER : Is C++11 supported?
-
-// CATCH_CONFIG_VARIADIC_MACROS : are variadic macros supported?
-// CATCH_CONFIG_COUNTER : is the __COUNTER__ macro supported?
-// ****************
-// Note to maintainers: if new toggles are added please document them
-// in configuration.md, too
-// ****************
-
-// In general each macro has a _NO_<feature name> form
-// (e.g. CATCH_CONFIG_CPP11_NO_NULLPTR) which disables the feature.
-// Many features, at point of detection, define an _INTERNAL_ macro, so they
-// can be combined, en-mass, with the _NO_ forms later.
-
-// All the C++11 features can be disabled with CATCH_CONFIG_NO_CPP11
-
-#if defined(__cplusplus) && __cplusplus >= 201103L
-#  define CATCH_CPP11_OR_GREATER
-#endif
-
-#ifdef __clang__
-
-#  if __has_feature(cxx_nullptr)
-#    define CATCH_INTERNAL_CONFIG_CPP11_NULLPTR
-#  endif
-
-#  if __has_feature(cxx_noexcept)
-#    define CATCH_INTERNAL_CONFIG_CPP11_NOEXCEPT
-#  endif
-
-#   if defined(CATCH_CPP11_OR_GREATER)
-#       define CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS _Pragma( "clang diagnostic ignored \"-Wparentheses\"" )
-#   endif
-
-#endif // __clang__
-
-////////////////////////////////////////////////////////////////////////////////
-// Borland
-#ifdef __BORLANDC__
-
-#endif // __BORLANDC__
-
-////////////////////////////////////////////////////////////////////////////////
-// EDG
-#ifdef __EDG_VERSION__
-
-#endif // __EDG_VERSION__
-
-////////////////////////////////////////////////////////////////////////////////
-// Digital Mars
-#ifdef __DMC__
-
-#endif // __DMC__
-
-////////////////////////////////////////////////////////////////////////////////
-// GCC
-#ifdef __GNUC__
-
-#   if __GNUC__ == 4 && __GNUC_MINOR__ >= 6 && defined(__GXX_EXPERIMENTAL_CXX0X__)
-#       define CATCH_INTERNAL_CONFIG_CPP11_NULLPTR
-#   endif
-
-#   if !defined(CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS) && defined(CATCH_CPP11_OR_GREATER)
-#       define CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS _Pragma( "GCC diagnostic ignored \"-Wparentheses\"" )
-#   endif
-
-// - otherwise more recent versions define __cplusplus >= 201103L
-// and will get picked up below
-
-#endif // __GNUC__
-
-////////////////////////////////////////////////////////////////////////////////
-// Visual C++
-#ifdef _MSC_VER
-
-#if (_MSC_VER >= 1600)
-#   define CATCH_INTERNAL_CONFIG_CPP11_NULLPTR
-#   define CATCH_INTERNAL_CONFIG_CPP11_UNIQUE_PTR
-#endif
-
-#if (_MSC_VER >= 1900 ) // (VC++ 13 (VS2015))
-#define CATCH_INTERNAL_CONFIG_CPP11_NOEXCEPT
-#define CATCH_INTERNAL_CONFIG_CPP11_GENERATED_METHODS
-#endif
-
-#endif // _MSC_VER
-
-////////////////////////////////////////////////////////////////////////////////
-
-// Use variadic macros if the compiler supports them
-#if ( defined _MSC_VER && _MSC_VER > 1400 && !defined __EDGE__) || \
-    ( defined __WAVE__ && __WAVE_HAS_VARIADICS ) || \
-    ( defined __GNUC__ && __GNUC__ >= 3 ) || \
-    ( !defined __cplusplus && __STDC_VERSION__ >= 199901L || __cplusplus >= 201103L )
-
-#define CATCH_INTERNAL_CONFIG_VARIADIC_MACROS
-
-#endif
-
-// Use __COUNTER__ if the compiler supports it
-#if ( defined _MSC_VER && _MSC_VER >= 1300 ) || \
-    ( defined __GNUC__  && __GNUC__ >= 4 && __GNUC_MINOR__ >= 3 ) || \
-    ( defined __clang__ && __clang_major__ >= 3 )
-
-#define CATCH_INTERNAL_CONFIG_COUNTER
-
-#endif
-
-////////////////////////////////////////////////////////////////////////////////
-// C++ language feature support
-
-// catch all support for C++11
-#if defined(CATCH_CPP11_OR_GREATER)
-
-#  if !defined(CATCH_INTERNAL_CONFIG_CPP11_NULLPTR)
-#    define CATCH_INTERNAL_CONFIG_CPP11_NULLPTR
-#  endif
-
-#  ifndef CATCH_INTERNAL_CONFIG_CPP11_NOEXCEPT
-#    define CATCH_INTERNAL_CONFIG_CPP11_NOEXCEPT
-#  endif
-
-#  ifndef CATCH_INTERNAL_CONFIG_CPP11_GENERATED_METHODS
-#    define CATCH_INTERNAL_CONFIG_CPP11_GENERATED_METHODS
-#  endif
-
-#  ifndef CATCH_INTERNAL_CONFIG_CPP11_IS_ENUM
-#    define CATCH_INTERNAL_CONFIG_CPP11_IS_ENUM
-#  endif
-
-#  ifndef CATCH_INTERNAL_CONFIG_CPP11_TUPLE
-#    define CATCH_INTERNAL_CONFIG_CPP11_TUPLE
-#  endif
-
-#  ifndef CATCH_INTERNAL_CONFIG_VARIADIC_MACROS
-#    define CATCH_INTERNAL_CONFIG_VARIADIC_MACROS
-#  endif
-
-#  if !defined(CATCH_INTERNAL_CONFIG_CPP11_LONG_LONG)
-#    define CATCH_INTERNAL_CONFIG_CPP11_LONG_LONG
-#  endif
-
-#  if !defined(CATCH_INTERNAL_CONFIG_CPP11_OVERRIDE)
-#    define CATCH_INTERNAL_CONFIG_CPP11_OVERRIDE
-#  endif
-#  if !defined(CATCH_INTERNAL_CONFIG_CPP11_UNIQUE_PTR)
-#    define CATCH_INTERNAL_CONFIG_CPP11_UNIQUE_PTR
-#  endif
-
-#endif // __cplusplus >= 201103L
-
-// Now set the actual defines based on the above + anything the user has configured
-#if defined(CATCH_INTERNAL_CONFIG_CPP11_NULLPTR) && !defined(CATCH_CONFIG_CPP11_NO_NULLPTR) && !defined(CATCH_CONFIG_CPP11_NULLPTR) && !defined(CATCH_CONFIG_NO_CPP11)
-#   define CATCH_CONFIG_CPP11_NULLPTR
-#endif
-#if defined(CATCH_INTERNAL_CONFIG_CPP11_NOEXCEPT) && !defined(CATCH_CONFIG_CPP11_NO_NOEXCEPT) && !defined(CATCH_CONFIG_CPP11_NOEXCEPT) && !defined(CATCH_CONFIG_NO_CPP11)
-#   define CATCH_CONFIG_CPP11_NOEXCEPT
-#endif
-#if defined(CATCH_INTERNAL_CONFIG_CPP11_GENERATED_METHODS) && !defined(CATCH_CONFIG_CPP11_NO_GENERATED_METHODS) && !defined(CATCH_CONFIG_CPP11_GENERATED_METHODS) && !defined(CATCH_CONFIG_NO_CPP11)
-#   define CATCH_CONFIG_CPP11_GENERATED_METHODS
-#endif
-#if defined(CATCH_INTERNAL_CONFIG_CPP11_IS_ENUM) && !defined(CATCH_CONFIG_CPP11_NO_IS_ENUM) && !defined(CATCH_CONFIG_CPP11_IS_ENUM) && !defined(CATCH_CONFIG_NO_CPP11)
-#   define CATCH_CONFIG_CPP11_IS_ENUM
-#endif
-#if defined(CATCH_INTERNAL_CONFIG_CPP11_TUPLE) && !defined(CATCH_CONFIG_CPP11_NO_TUPLE) && !defined(CATCH_CONFIG_CPP11_TUPLE) && !defined(CATCH_CONFIG_NO_CPP11)
-#   define CATCH_CONFIG_CPP11_TUPLE
-#endif
-#if defined(CATCH_INTERNAL_CONFIG_VARIADIC_MACROS) && !defined(CATCH_CONFIG_NO_VARIADIC_MACROS) && !defined(CATCH_CONFIG_VARIADIC_MACROS)
-#   define CATCH_CONFIG_VARIADIC_MACROS
-#endif
-#if defined(CATCH_INTERNAL_CONFIG_CPP11_LONG_LONG) && !defined(CATCH_CONFIG_NO_LONG_LONG) && !defined(CATCH_CONFIG_CPP11_LONG_LONG) && !defined(CATCH_CONFIG_NO_CPP11)
-#   define CATCH_CONFIG_CPP11_LONG_LONG
-#endif
-#if defined(CATCH_INTERNAL_CONFIG_CPP11_OVERRIDE) && !defined(CATCH_CONFIG_NO_OVERRIDE) && !defined(CATCH_CONFIG_CPP11_OVERRIDE) && !defined(CATCH_CONFIG_NO_CPP11)
-#   define CATCH_CONFIG_CPP11_OVERRIDE
-#endif
-#if defined(CATCH_INTERNAL_CONFIG_CPP11_UNIQUE_PTR) && !defined(CATCH_CONFIG_NO_UNIQUE_PTR) && !defined(CATCH_CONFIG_CPP11_UNIQUE_PTR) && !defined(CATCH_CONFIG_NO_CPP11)
-#   define CATCH_CONFIG_CPP11_UNIQUE_PTR
-#endif
-#if defined(CATCH_INTERNAL_CONFIG_COUNTER) && !defined(CATCH_CONFIG_NO_COUNTER) && !defined(CATCH_CONFIG_COUNTER)
-#   define CATCH_CONFIG_COUNTER
-#endif
-
-#if !defined(CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS)
-#   define CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS
-#endif
-
-// noexcept support:
-#if defined(CATCH_CONFIG_CPP11_NOEXCEPT) && !defined(CATCH_NOEXCEPT)
-#  define CATCH_NOEXCEPT noexcept
-#  define CATCH_NOEXCEPT_IS(x) noexcept(x)
-#else
-#  define CATCH_NOEXCEPT throw()
-#  define CATCH_NOEXCEPT_IS(x)
-#endif
-
-// nullptr support
-#ifdef CATCH_CONFIG_CPP11_NULLPTR
-#   define CATCH_NULL nullptr
-#else
-#   define CATCH_NULL NULL
-#endif
-
-// override support
-#ifdef CATCH_CONFIG_CPP11_OVERRIDE
-#   define CATCH_OVERRIDE override
-#else
-#   define CATCH_OVERRIDE
-#endif
-
-// unique_ptr support
-#ifdef CATCH_CONFIG_CPP11_UNIQUE_PTR
-#   define CATCH_AUTO_PTR( T ) std::unique_ptr<T>
-#else
-#   define CATCH_AUTO_PTR( T ) std::auto_ptr<T>
-#endif
-
-namespace Catch {
-
-    struct IConfig;
-
-    struct CaseSensitive { enum Choice {
-        Yes,
-        No
-    }; };
-
-    class NonCopyable {
-#ifdef CATCH_CONFIG_CPP11_GENERATED_METHODS
-        NonCopyable( NonCopyable const& )              = delete;
-        NonCopyable( NonCopyable && )                  = delete;
-        NonCopyable& operator = ( NonCopyable const& ) = delete;
-        NonCopyable& operator = ( NonCopyable && )     = delete;
-#else
-        NonCopyable( NonCopyable const& info );
-        NonCopyable& operator = ( NonCopyable const& );
-#endif
-
-    protected:
-        NonCopyable() {}
-        virtual ~NonCopyable();
-    };
-
-    class SafeBool {
-    public:
-        typedef void (SafeBool::*type)() const;
-
-        static type makeSafe( bool value ) {
-            return value ? &SafeBool::trueValue : 0;
-        }
-    private:
-        void trueValue() const {}
-    };
-
-    template<typename ContainerT>
-    inline void deleteAll( ContainerT& container ) {
-        typename ContainerT::const_iterator it = container.begin();
-        typename ContainerT::const_iterator itEnd = container.end();
-        for(; it != itEnd; ++it )
-            delete *it;
-    }
-    template<typename AssociativeContainerT>
-    inline void deleteAllValues( AssociativeContainerT& container ) {
-        typename AssociativeContainerT::const_iterator it = container.begin();
-        typename AssociativeContainerT::const_iterator itEnd = container.end();
-        for(; it != itEnd; ++it )
-            delete it->second;
-    }
-
-    bool startsWith( std::string const& s, std::string const& prefix );
-    bool endsWith( std::string const& s, std::string const& suffix );
-    bool contains( std::string const& s, std::string const& infix );
-    void toLowerInPlace( std::string& s );
-    std::string toLower( std::string const& s );
-    std::string trim( std::string const& str );
-    bool replaceInPlace( std::string& str, std::string const& replaceThis, std::string const& withThis );
-
-    struct pluralise {
-        pluralise( std::size_t count, std::string const& label );
-
-        friend std::ostream& operator << ( std::ostream& os, pluralise const& pluraliser );
-
-        std::size_t m_count;
-        std::string m_label;
-    };
-
-    struct SourceLineInfo {
-
-        SourceLineInfo();
-        SourceLineInfo( char const* _file, std::size_t _line );
-        SourceLineInfo( SourceLineInfo const& other );
-#  ifdef CATCH_CONFIG_CPP11_GENERATED_METHODS
-        SourceLineInfo( SourceLineInfo && )                  = default;
-        SourceLineInfo& operator = ( SourceLineInfo const& ) = default;
-        SourceLineInfo& operator = ( SourceLineInfo && )     = default;
-#  endif
-        bool empty() const;
-        bool operator == ( SourceLineInfo const& other ) const;
-        bool operator < ( SourceLineInfo const& other ) const;
-
-        std::string file;
-        std::size_t line;
-    };
-
-    std::ostream& operator << ( std::ostream& os, SourceLineInfo const& info );
-
-    // This is just here to avoid compiler warnings with macro constants and boolean literals
-    inline bool isTrue( bool value ){ return value; }
-    inline bool alwaysTrue() { return true; }
-    inline bool alwaysFalse() { return false; }
-
-    void throwLogicError( std::string const& message, SourceLineInfo const& locationInfo );
-
-    void seedRng( IConfig const& config );
-    unsigned int rngSeed();
-
-    // Use this in variadic streaming macros to allow
-    //    >> +StreamEndStop
-    // as well as
-    //    >> stuff +StreamEndStop
-    struct StreamEndStop {
-        std::string operator+() {
-            return std::string();
-        }
-    };
-    template<typename T>
-    T const& operator + ( T const& value, StreamEndStop ) {
-        return value;
-    }
-}
-
-#define CATCH_INTERNAL_LINEINFO ::Catch::SourceLineInfo( __FILE__, static_cast<std::size_t>( __LINE__ ) )
-#define CATCH_INTERNAL_ERROR( msg ) ::Catch::throwLogicError( msg, CATCH_INTERNAL_LINEINFO );
-
-#include <ostream>
-
-namespace Catch {
-
-    class NotImplementedException : public std::exception
-    {
-    public:
-        NotImplementedException( SourceLineInfo const& lineInfo );
-        NotImplementedException( NotImplementedException const& ) {}
-
-        virtual ~NotImplementedException() CATCH_NOEXCEPT {}
-
-        virtual const char* what() const CATCH_NOEXCEPT;
-
-    private:
-        std::string m_what;
-        SourceLineInfo m_lineInfo;
-    };
-
-} // end namespace Catch
-
-///////////////////////////////////////////////////////////////////////////////
-#define CATCH_NOT_IMPLEMENTED throw Catch::NotImplementedException( CATCH_INTERNAL_LINEINFO )
-
-// #included from: internal/catch_context.h
-#define TWOBLUECUBES_CATCH_CONTEXT_H_INCLUDED
-
-// #included from: catch_interfaces_generators.h
-#define TWOBLUECUBES_CATCH_INTERFACES_GENERATORS_H_INCLUDED
-
-#include <string>
-
-namespace Catch {
-
-    struct IGeneratorInfo {
-        virtual ~IGeneratorInfo();
-        virtual bool moveNext() = 0;
-        virtual std::size_t getCurrentIndex() const = 0;
-    };
-
-    struct IGeneratorsForTest {
-        virtual ~IGeneratorsForTest();
-
-        virtual IGeneratorInfo& getGeneratorInfo( std::string const& fileInfo, std::size_t size ) = 0;
-        virtual bool moveNext() = 0;
-    };
-
-    IGeneratorsForTest* createGeneratorsForTest();
-
-} // end namespace Catch
-
-// #included from: catch_ptr.hpp
-#define TWOBLUECUBES_CATCH_PTR_HPP_INCLUDED
-
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wpadded"
-#endif
-
-namespace Catch {
-
-    // An intrusive reference counting smart pointer.
-    // T must implement addRef() and release() methods
-    // typically implementing the IShared interface
-    template<typename T>
-    class Ptr {
-    public:
-        Ptr() : m_p( CATCH_NULL ){}
-        Ptr( T* p ) : m_p( p ){
-            if( m_p )
-                m_p->addRef();
-        }
-        Ptr( Ptr const& other ) : m_p( other.m_p ){
-            if( m_p )
-                m_p->addRef();
-        }
-        ~Ptr(){
-            if( m_p )
-                m_p->release();
-        }
-        void reset() {
-            if( m_p )
-                m_p->release();
-            m_p = CATCH_NULL;
-        }
-        Ptr& operator = ( T* p ){
-            Ptr temp( p );
-            swap( temp );
-            return *this;
-        }
-        Ptr& operator = ( Ptr const& other ){
-            Ptr temp( other );
-            swap( temp );
-            return *this;
-        }
-        void swap( Ptr& other ) { std::swap( m_p, other.m_p ); }
-        T* get() const{ return m_p; }
-        T& operator*() const { return *m_p; }
-        T* operator->() const { return m_p; }
-        bool operator !() const { return m_p == CATCH_NULL; }
-        operator SafeBool::type() const { return SafeBool::makeSafe( m_p != CATCH_NULL ); }
-
-    private:
-        T* m_p;
-    };
-
-    struct IShared : NonCopyable {
-        virtual ~IShared();
-        virtual void addRef() const = 0;
-        virtual void release() const = 0;
-    };
-
-    template<typename T = IShared>
-    struct SharedImpl : T {
-
-        SharedImpl() : m_rc( 0 ){}
-
-        virtual void addRef() const {
-            ++m_rc;
-        }
-        virtual void release() const {
-            if( --m_rc == 0 )
-                delete this;
-        }
-
-        mutable unsigned int m_rc;
-    };
-
-} // end namespace Catch
-
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
-#include <memory>
-#include <vector>
-#include <stdlib.h>
-
-namespace Catch {
-
-    class TestCase;
-    class Stream;
-    struct IResultCapture;
-    struct IRunner;
-    struct IGeneratorsForTest;
-    struct IConfig;
-
-    struct IContext
-    {
-        virtual ~IContext();
-
-        virtual IResultCapture* getResultCapture() = 0;
-        virtual IRunner* getRunner() = 0;
-        virtual size_t getGeneratorIndex( std::string const& fileInfo, size_t totalSize ) = 0;
-        virtual bool advanceGeneratorsForCurrentTest() = 0;
-        virtual Ptr<IConfig const> getConfig() const = 0;
-    };
-
-    struct IMutableContext : IContext
-    {
-        virtual ~IMutableContext();
-        virtual void setResultCapture( IResultCapture* resultCapture ) = 0;
-        virtual void setRunner( IRunner* runner ) = 0;
-        virtual void setConfig( Ptr<IConfig const> const& config ) = 0;
-    };
-
-    IContext& getCurrentContext();
-    IMutableContext& getCurrentMutableContext();
-    void cleanUpContext();
-    Stream createStream( std::string const& streamName );
-
-}
-
-// #included from: internal/catch_test_registry.hpp
-#define TWOBLUECUBES_CATCH_TEST_REGISTRY_HPP_INCLUDED
-
-// #included from: catch_interfaces_testcase.h
-#define TWOBLUECUBES_CATCH_INTERFACES_TESTCASE_H_INCLUDED
-
-#include <vector>
-
-namespace Catch {
-
-    class TestSpec;
-
-    struct ITestCase : IShared {
-        virtual void invoke () const = 0;
-    protected:
-        virtual ~ITestCase();
-    };
-
-    class TestCase;
-    struct IConfig;
-
-    struct ITestCaseRegistry {
-        virtual ~ITestCaseRegistry();
-        virtual std::vector<TestCase> const& getAllTests() const = 0;
-        virtual std::vector<TestCase> const& getAllTestsSorted( IConfig const& config ) const = 0;
-    };
-
-    bool matchTest( TestCase const& testCase, TestSpec const& testSpec, IConfig const& config );
-    std::vector<TestCase> filterTests( std::vector<TestCase> const& testCases, TestSpec const& testSpec, IConfig const& config );
-    std::vector<TestCase> const& getAllTestCasesSorted( IConfig const& config );
-
-}
-
-namespace Catch {
-
-template<typename C>
-class MethodTestCase : public SharedImpl<ITestCase> {
-
-public:
-    MethodTestCase( void (C::*method)() ) : m_method( method ) {}
-
-    virtual void invoke() const {
-        C obj;
-        (obj.*m_method)();
-    }
-
-private:
-    virtual ~MethodTestCase() {}
-
-    void (C::*m_method)();
-};
-
-typedef void(*TestFunction)();
-
-struct NameAndDesc {
-    NameAndDesc( const char* _name = "", const char* _description= "" )
-    : name( _name ), description( _description )
-    {}
-
-    const char* name;
-    const char* description;
-};
-
-void registerTestCase
-    (   ITestCase* testCase,
-        char const* className,
-        NameAndDesc const& nameAndDesc,
-        SourceLineInfo const& lineInfo );
-
-struct AutoReg {
-
-    AutoReg
-        (   TestFunction function,
-            SourceLineInfo const& lineInfo,
-            NameAndDesc const& nameAndDesc );
-
-    template<typename C>
-    AutoReg
-        (   void (C::*method)(),
-            char const* className,
-            NameAndDesc const& nameAndDesc,
-            SourceLineInfo const& lineInfo ) {
-
-        registerTestCase
-            (   new MethodTestCase<C>( method ),
-                className,
-                nameAndDesc,
-                lineInfo );
-    }
-
-    ~AutoReg();
-
-private:
-    AutoReg( AutoReg const& );
-    void operator= ( AutoReg const& );
-};
-
-void registerTestCaseFunction
-    (   TestFunction function,
-        SourceLineInfo const& lineInfo,
-        NameAndDesc const& nameAndDesc );
-
-} // end namespace Catch
-
-#ifdef CATCH_CONFIG_VARIADIC_MACROS
-    ///////////////////////////////////////////////////////////////////////////////
-    #define INTERNAL_CATCH_TESTCASE2( TestName, ... ) \
-        static void TestName(); \
-        namespace{ Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( &TestName, CATCH_INTERNAL_LINEINFO, Catch::NameAndDesc( __VA_ARGS__ ) ); }\
-        static void TestName()
-    #define INTERNAL_CATCH_TESTCASE( ... ) \
-        INTERNAL_CATCH_TESTCASE2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ), __VA_ARGS__ )
-
-    ///////////////////////////////////////////////////////////////////////////////
-    #define INTERNAL_CATCH_METHOD_AS_TEST_CASE( QualifiedMethod, ... ) \
-        namespace{ Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( &QualifiedMethod, "&" #QualifiedMethod, Catch::NameAndDesc( __VA_ARGS__ ), CATCH_INTERNAL_LINEINFO ); }
-
-    ///////////////////////////////////////////////////////////////////////////////
-    #define INTERNAL_CATCH_TEST_CASE_METHOD2( TestName, ClassName, ... )\
-        namespace{ \
-            struct TestName : ClassName{ \
-                void test(); \
-            }; \
-            Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar ) ( &TestName::test, #ClassName, Catch::NameAndDesc( __VA_ARGS__ ), CATCH_INTERNAL_LINEINFO ); \
-        } \
-        void TestName::test()
-    #define INTERNAL_CATCH_TEST_CASE_METHOD( ClassName, ... ) \
-        INTERNAL_CATCH_TEST_CASE_METHOD2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ), ClassName, __VA_ARGS__ )
-
-    ///////////////////////////////////////////////////////////////////////////////
-    #define INTERNAL_CATCH_REGISTER_TESTCASE( Function, ... ) \
-        Catch::AutoReg( Function, CATCH_INTERNAL_LINEINFO, Catch::NameAndDesc( __VA_ARGS__ ) );
-
-#else
-    ///////////////////////////////////////////////////////////////////////////////
-    #define INTERNAL_CATCH_TESTCASE2( TestName, Name, Desc ) \
-        static void TestName(); \
-        namespace{ Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( &TestName, CATCH_INTERNAL_LINEINFO, Catch::NameAndDesc( Name, Desc ) ); }\
-        static void TestName()
-    #define INTERNAL_CATCH_TESTCASE( Name, Desc ) \
-        INTERNAL_CATCH_TESTCASE2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ), Name, Desc )
-
-    ///////////////////////////////////////////////////////////////////////////////
-    #define INTERNAL_CATCH_METHOD_AS_TEST_CASE( QualifiedMethod, Name, Desc ) \
-        namespace{ Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( &QualifiedMethod, "&" #QualifiedMethod, Catch::NameAndDesc( Name, Desc ), CATCH_INTERNAL_LINEINFO ); }
-
-    ///////////////////////////////////////////////////////////////////////////////
-    #define INTERNAL_CATCH_TEST_CASE_METHOD2( TestCaseName, ClassName, TestName, Desc )\
-        namespace{ \
-            struct TestCaseName : ClassName{ \
-                void test(); \
-            }; \
-            Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar ) ( &TestCaseName::test, #ClassName, Catch::NameAndDesc( TestName, Desc ), CATCH_INTERNAL_LINEINFO ); \
-        } \
-        void TestCaseName::test()
-    #define INTERNAL_CATCH_TEST_CASE_METHOD( ClassName, TestName, Desc )\
-        INTERNAL_CATCH_TEST_CASE_METHOD2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ), ClassName, TestName, Desc )
-
-    ///////////////////////////////////////////////////////////////////////////////
-    #define INTERNAL_CATCH_REGISTER_TESTCASE( Function, Name, Desc ) \
-        Catch::AutoReg( Function, CATCH_INTERNAL_LINEINFO, Catch::NameAndDesc( Name, Desc ) );
-#endif
-
-// #included from: internal/catch_capture.hpp
-#define TWOBLUECUBES_CATCH_CAPTURE_HPP_INCLUDED
-
-// #included from: catch_result_builder.h
-#define TWOBLUECUBES_CATCH_RESULT_BUILDER_H_INCLUDED
-
-// #included from: catch_result_type.h
-#define TWOBLUECUBES_CATCH_RESULT_TYPE_H_INCLUDED
-
-namespace Catch {
-
-    // ResultWas::OfType enum
-    struct ResultWas { enum OfType {
-        Unknown = -1,
-        Ok = 0,
-        Info = 1,
-        Warning = 2,
-
-        FailureBit = 0x10,
-
-        ExpressionFailed = FailureBit | 1,
-        ExplicitFailure = FailureBit | 2,
-
-        Exception = 0x100 | FailureBit,
-
-        ThrewException = Exception | 1,
-        DidntThrowException = Exception | 2,
-
-        FatalErrorCondition = 0x200 | FailureBit
-
-    }; };
-
-    inline bool isOk( ResultWas::OfType resultType ) {
-        return ( resultType & ResultWas::FailureBit ) == 0;
-    }
-    inline bool isJustInfo( int flags ) {
-        return flags == ResultWas::Info;
-    }
-
-    // ResultDisposition::Flags enum
-    struct ResultDisposition { enum Flags {
-        Normal = 0x01,
-
-        ContinueOnFailure = 0x02,   // Failures fail test, but execution continues
-        FalseTest = 0x04,           // Prefix expression with !
-        SuppressFail = 0x08         // Failures are reported but do not fail the test
-    }; };
-
-    inline ResultDisposition::Flags operator | ( ResultDisposition::Flags lhs, ResultDisposition::Flags rhs ) {
-        return static_cast<ResultDisposition::Flags>( static_cast<int>( lhs ) | static_cast<int>( rhs ) );
-    }
-
-    inline bool shouldContinueOnFailure( int flags )    { return ( flags & ResultDisposition::ContinueOnFailure ) != 0; }
-    inline bool isFalseTest( int flags )                { return ( flags & ResultDisposition::FalseTest ) != 0; }
-    inline bool shouldSuppressFailure( int flags )      { return ( flags & ResultDisposition::SuppressFail ) != 0; }
-
-} // end namespace Catch
-
-// #included from: catch_assertionresult.h
-#define TWOBLUECUBES_CATCH_ASSERTIONRESULT_H_INCLUDED
-
-#include <string>
-
-namespace Catch {
-
-    struct AssertionInfo
-    {
-        AssertionInfo() {}
-        AssertionInfo(  std::string const& _macroName,
-                        SourceLineInfo const& _lineInfo,
-                        std::string const& _capturedExpression,
-                        ResultDisposition::Flags _resultDisposition );
-
-        std::string macroName;
-        SourceLineInfo lineInfo;
-        std::string capturedExpression;
-        ResultDisposition::Flags resultDisposition;
-    };
-
-    struct AssertionResultData
-    {
-        AssertionResultData() : resultType( ResultWas::Unknown ) {}
-
-        std::string reconstructedExpression;
-        std::string message;
-        ResultWas::OfType resultType;
-    };
-
-    class AssertionResult {
-    public:
-        AssertionResult();
-        AssertionResult( AssertionInfo const& info, AssertionResultData const& data );
-        ~AssertionResult();
-#  ifdef CATCH_CONFIG_CPP11_GENERATED_METHODS
-         AssertionResult( AssertionResult const& )              = default;
-         AssertionResult( AssertionResult && )                  = default;
-         AssertionResult& operator = ( AssertionResult const& ) = default;
-         AssertionResult& operator = ( AssertionResult && )     = default;
-#  endif
-
-        bool isOk() const;
-        bool succeeded() const;
-        ResultWas::OfType getResultType() const;
-        bool hasExpression() const;
-        bool hasMessage() const;
-        std::string getExpression() const;
-        std::string getExpressionInMacro() const;
-        bool hasExpandedExpression() const;
-        std::string getExpandedExpression() const;
-        std::string getMessage() const;
-        SourceLineInfo getSourceInfo() const;
-        std::string getTestMacroName() const;
-
-    protected:
-        AssertionInfo m_info;
-        AssertionResultData m_resultData;
-    };
-
-} // end namespace Catch
-
-// #included from: catch_matchers.hpp
-#define TWOBLUECUBES_CATCH_MATCHERS_HPP_INCLUDED
-
-namespace Catch {
-namespace Matchers {
-    namespace Impl {
-
-    namespace Generic {
-        template<typename ExpressionT> class AllOf;
-        template<typename ExpressionT> class AnyOf;
-        template<typename ExpressionT> class Not;
-    }
-
-    template<typename ExpressionT>
-    struct Matcher : SharedImpl<IShared>
-    {
-        typedef ExpressionT ExpressionType;
-
-        virtual ~Matcher() {}
-        virtual Ptr<Matcher> clone() const = 0;
-        virtual bool match( ExpressionT const& expr ) const = 0;
-        virtual std::string toString() const = 0;
-
-        Generic::AllOf<ExpressionT> operator && ( Matcher<ExpressionT> const& other ) const;
-        Generic::AnyOf<ExpressionT> operator || ( Matcher<ExpressionT> const& other ) const;
-        Generic::Not<ExpressionT> operator ! () const;
-    };
-
-    template<typename DerivedT, typename ExpressionT>
-    struct MatcherImpl : Matcher<ExpressionT> {
-
-        virtual Ptr<Matcher<ExpressionT> > clone() const {
-            return Ptr<Matcher<ExpressionT> >( new DerivedT( static_cast<DerivedT const&>( *this ) ) );
-        }
-    };
-
-    namespace Generic {
-        template<typename ExpressionT>
-        class Not : public MatcherImpl<Not<ExpressionT>, ExpressionT> {
-        public:
-            explicit Not( Matcher<ExpressionT> const& matcher ) : m_matcher(matcher.clone()) {}
-            Not( Not const& other ) : m_matcher( other.m_matcher ) {}
-
-            virtual bool match( ExpressionT const& expr ) const CATCH_OVERRIDE {
-                return !m_matcher->match( expr );
-            }
-
-            virtual std::string toString() const CATCH_OVERRIDE {
-                return "not " + m_matcher->toString();
-            }
-        private:
-            Ptr< Matcher<ExpressionT> > m_matcher;
-        };
-
-        template<typename ExpressionT>
-        class AllOf : public MatcherImpl<AllOf<ExpressionT>, ExpressionT> {
-        public:
-
-            AllOf() {}
-            AllOf( AllOf const& other ) : m_matchers( other.m_matchers ) {}
-
-            AllOf& add( Matcher<ExpressionT> const& matcher ) {
-                m_matchers.push_back( matcher.clone() );
-                return *this;
-            }
-            virtual bool match( ExpressionT const& expr ) const
-            {
-                for( std::size_t i = 0; i < m_matchers.size(); ++i )
-                    if( !m_matchers[i]->match( expr ) )
-                        return false;
-                return true;
-            }
-            virtual std::string toString() const {
-                std::ostringstream oss;
-                oss << "( ";
-                for( std::size_t i = 0; i < m_matchers.size(); ++i ) {
-                    if( i != 0 )
-                        oss << " and ";
-                    oss << m_matchers[i]->toString();
-                }
-                oss << " )";
-                return oss.str();
-            }
-
-            AllOf operator && ( Matcher<ExpressionT> const& other ) const {
-                AllOf allOfExpr( *this );
-                allOfExpr.add( other );
-                return allOfExpr;
-            }
-
-        private:
-            std::vector<Ptr<Matcher<ExpressionT> > > m_matchers;
-        };
-
-        template<typename ExpressionT>
-        class AnyOf : public MatcherImpl<AnyOf<ExpressionT>, ExpressionT> {
-        public:
-
-            AnyOf() {}
-            AnyOf( AnyOf const& other ) : m_matchers( other.m_matchers ) {}
-
-            AnyOf& add( Matcher<ExpressionT> const& matcher ) {
-                m_matchers.push_back( matcher.clone() );
-                return *this;
-            }
-            virtual bool match( ExpressionT const& expr ) const
-            {
-                for( std::size_t i = 0; i < m_matchers.size(); ++i )
-                    if( m_matchers[i]->match( expr ) )
-                        return true;
-                return false;
-            }
-            virtual std::string toString() const {
-                std::ostringstream oss;
-                oss << "( ";
-                for( std::size_t i = 0; i < m_matchers.size(); ++i ) {
-                    if( i != 0 )
-                        oss << " or ";
-                    oss << m_matchers[i]->toString();
-                }
-                oss << " )";
-                return oss.str();
-            }
-
-            AnyOf operator || ( Matcher<ExpressionT> const& other ) const {
-                AnyOf anyOfExpr( *this );
-                anyOfExpr.add( other );
-                return anyOfExpr;
-            }
-
-        private:
-            std::vector<Ptr<Matcher<ExpressionT> > > m_matchers;
-        };
-
-    } // namespace Generic
-
-    template<typename ExpressionT>
-    Generic::AllOf<ExpressionT> Matcher<ExpressionT>::operator && ( Matcher<ExpressionT> const& other ) const {
-        Generic::AllOf<ExpressionT> allOfExpr;
-        allOfExpr.add( *this );
-        allOfExpr.add( other );
-        return allOfExpr;
-    }
-
-    template<typename ExpressionT>
-    Generic::AnyOf<ExpressionT> Matcher<ExpressionT>::operator || ( Matcher<ExpressionT> const& other ) const {
-        Generic::AnyOf<ExpressionT> anyOfExpr;
-        anyOfExpr.add( *this );
-        anyOfExpr.add( other );
-        return anyOfExpr;
-    }
-
-    template<typename ExpressionT>
-    Generic::Not<ExpressionT> Matcher<ExpressionT>::operator ! () const {
-        return Generic::Not<ExpressionT>( *this );
-    }
-
-    namespace StdString {
-
-        inline std::string makeString( std::string const& str ) { return str; }
-        inline std::string makeString( const char* str ) { return str ? std::string( str ) : std::string(); }
-
-        struct CasedString
-        {
-            CasedString( std::string const& str, CaseSensitive::Choice caseSensitivity )
-            :   m_caseSensitivity( caseSensitivity ),
-                m_str( adjustString( str ) )
-            {}
-            std::string adjustString( std::string const& str ) const {
-                return m_caseSensitivity == CaseSensitive::No
-                    ? toLower( str )
-                    : str;
-
-            }
-            std::string toStringSuffix() const
-            {
-                return m_caseSensitivity == CaseSensitive::No
-                    ? " (case insensitive)"
-                    : "";
-            }
-            CaseSensitive::Choice m_caseSensitivity;
-            std::string m_str;
-        };
-
-        struct Equals : MatcherImpl<Equals, std::string> {
-            Equals( std::string const& str, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes )
-            :   m_data( str, caseSensitivity )
-            {}
-            Equals( Equals const& other ) : m_data( other.m_data ){}
-
-            virtual ~Equals();
-
-            virtual bool match( std::string const& expr ) const {
-                return m_data.m_str == m_data.adjustString( expr );;
-            }
-            virtual std::string toString() const {
-                return "equals: \"" + m_data.m_str + "\"" + m_data.toStringSuffix();
-            }
-
-            CasedString m_data;
-        };
-
-        struct Contains : MatcherImpl<Contains, std::string> {
-            Contains( std::string const& substr, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes )
-            : m_data( substr, caseSensitivity ){}
-            Contains( Contains const& other ) : m_data( other.m_data ){}
-
-            virtual ~Contains();
-
-            virtual bool match( std::string const& expr ) const {
-                return m_data.adjustString( expr ).find( m_data.m_str ) != std::string::npos;
-            }
-            virtual std::string toString() const {
-                return "contains: \"" + m_data.m_str  + "\"" + m_data.toStringSuffix();
-            }
-
-            CasedString m_data;
-        };
-
-        struct StartsWith : MatcherImpl<StartsWith, std::string> {
-            StartsWith( std::string const& substr, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes )
-            : m_data( substr, caseSensitivity ){}
-
-            StartsWith( StartsWith const& other ) : m_data( other.m_data ){}
-
-            virtual ~StartsWith();
-
-            virtual bool match( std::string const& expr ) const {
-                return startsWith( m_data.adjustString( expr ), m_data.m_str );
-            }
-            virtual std::string toString() const {
-                return "starts with: \"" + m_data.m_str + "\"" + m_data.toStringSuffix();
-            }
-
-            CasedString m_data;
-        };
-
-        struct EndsWith : MatcherImpl<EndsWith, std::string> {
-            EndsWith( std::string const& substr, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes )
-            : m_data( substr, caseSensitivity ){}
-            EndsWith( EndsWith const& other ) : m_data( other.m_data ){}
-
-            virtual ~EndsWith();
-
-            virtual bool match( std::string const& expr ) const {
-                return endsWith( m_data.adjustString( expr ), m_data.m_str );
-            }
-            virtual std::string toString() const {
-                return "ends with: \"" + m_data.m_str + "\"" + m_data.toStringSuffix();
-            }
-
-            CasedString m_data;
-        };
-    } // namespace StdString
-    } // namespace Impl
-
-    // The following functions create the actual matcher objects.
-    // This allows the types to be inferred
-    template<typename ExpressionT>
-    inline Impl::Generic::Not<ExpressionT> Not( Impl::Matcher<ExpressionT> const& m ) {
-        return Impl::Generic::Not<ExpressionT>( m );
-    }
-
-    template<typename ExpressionT>
-    inline Impl::Generic::AllOf<ExpressionT> AllOf( Impl::Matcher<ExpressionT> const& m1,
-                                                    Impl::Matcher<ExpressionT> const& m2 ) {
-        return Impl::Generic::AllOf<ExpressionT>().add( m1 ).add( m2 );
-    }
-    template<typename ExpressionT>
-    inline Impl::Generic::AllOf<ExpressionT> AllOf( Impl::Matcher<ExpressionT> const& m1,
-                                                    Impl::Matcher<ExpressionT> const& m2,
-                                                    Impl::Matcher<ExpressionT> const& m3 ) {
-        return Impl::Generic::AllOf<ExpressionT>().add( m1 ).add( m2 ).add( m3 );
-    }
-    template<typename ExpressionT>
-    inline Impl::Generic::AnyOf<ExpressionT> AnyOf( Impl::Matcher<ExpressionT> const& m1,
-                                                    Impl::Matcher<ExpressionT> const& m2 ) {
-        return Impl::Generic::AnyOf<ExpressionT>().add( m1 ).add( m2 );
-    }
-    template<typename ExpressionT>
-    inline Impl::Generic::AnyOf<ExpressionT> AnyOf( Impl::Matcher<ExpressionT> const& m1,
-                                                    Impl::Matcher<ExpressionT> const& m2,
-                                                    Impl::Matcher<ExpressionT> const& m3 ) {
-        return Impl::Generic::AnyOf<ExpressionT>().add( m1 ).add( m2 ).add( m3 );
-    }
-
-    inline Impl::StdString::Equals      Equals( std::string const& str, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes ) {
-        return Impl::StdString::Equals( str, caseSensitivity );
-    }
-    inline Impl::StdString::Equals      Equals( const char* str, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes ) {
-        return Impl::StdString::Equals( Impl::StdString::makeString( str ), caseSensitivity );
-    }
-    inline Impl::StdString::Contains    Contains( std::string const& substr, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes ) {
-        return Impl::StdString::Contains( substr, caseSensitivity );
-    }
-    inline Impl::StdString::Contains    Contains( const char* substr, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes ) {
-        return Impl::StdString::Contains( Impl::StdString::makeString( substr ), caseSensitivity );
-    }
-    inline Impl::StdString::StartsWith  StartsWith( std::string const& substr ) {
-        return Impl::StdString::StartsWith( substr );
-    }
-    inline Impl::StdString::StartsWith  StartsWith( const char* substr ) {
-        return Impl::StdString::StartsWith( Impl::StdString::makeString( substr ) );
-    }
-    inline Impl::StdString::EndsWith    EndsWith( std::string const& substr ) {
-        return Impl::StdString::EndsWith( substr );
-    }
-    inline Impl::StdString::EndsWith    EndsWith( const char* substr ) {
-        return Impl::StdString::EndsWith( Impl::StdString::makeString( substr ) );
-    }
-
-} // namespace Matchers
-
-using namespace Matchers;
-
-} // namespace Catch
-
-namespace Catch {
-
-    struct TestFailureException{};
-
-    template<typename T> class ExpressionLhs;
-
-    struct STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison;
-
-    struct CopyableStream {
-        CopyableStream() {}
-        CopyableStream( CopyableStream const& other ) {
-            oss << other.oss.str();
-        }
-        CopyableStream& operator=( CopyableStream const& other ) {
-            oss.str("");
-            oss << other.oss.str();
-            return *this;
-        }
-        std::ostringstream oss;
-    };
-
-    class ResultBuilder {
-    public:
-        ResultBuilder(  char const* macroName,
-                        SourceLineInfo const& lineInfo,
-                        char const* capturedExpression,
-                        ResultDisposition::Flags resultDisposition,
-                        char const* secondArg = "" );
-
-        template<typename T>
-        ExpressionLhs<T const&> operator <= ( T const& operand );
-        ExpressionLhs<bool> operator <= ( bool value );
-
-        template<typename T>
-        ResultBuilder& operator << ( T const& value ) {
-            m_stream.oss << value;
-            return *this;
-        }
-
-        template<typename RhsT> STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator && ( RhsT const& );
-        template<typename RhsT> STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator || ( RhsT const& );
-
-        ResultBuilder& setResultType( ResultWas::OfType result );
-        ResultBuilder& setResultType( bool result );
-        ResultBuilder& setLhs( std::string const& lhs );
-        ResultBuilder& setRhs( std::string const& rhs );
-        ResultBuilder& setOp( std::string const& op );
-
-        void endExpression();
-
-        std::string reconstructExpression() const;
-        AssertionResult build() const;
-
-        void useActiveException( ResultDisposition::Flags resultDisposition = ResultDisposition::Normal );
-        void captureResult( ResultWas::OfType resultType );
-        void captureExpression();
-        void captureExpectedException( std::string const& expectedMessage );
-        void captureExpectedException( Matchers::Impl::Matcher<std::string> const& matcher );
-        void handleResult( AssertionResult const& result );
-        void react();
-        bool shouldDebugBreak() const;
-        bool allowThrows() const;
-
-    private:
-        AssertionInfo m_assertionInfo;
-        AssertionResultData m_data;
-        struct ExprComponents {
-            ExprComponents() : testFalse( false ) {}
-            bool testFalse;
-            std::string lhs, rhs, op;
-        } m_exprComponents;
-        CopyableStream m_stream;
-
-        bool m_shouldDebugBreak;
-        bool m_shouldThrow;
-    };
-
-} // namespace Catch
-
-// Include after due to circular dependency:
-// #included from: catch_expression_lhs.hpp
-#define TWOBLUECUBES_CATCH_EXPRESSION_LHS_HPP_INCLUDED
-
-// #included from: catch_evaluate.hpp
-#define TWOBLUECUBES_CATCH_EVALUATE_HPP_INCLUDED
-
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable:4389) // '==' : signed/unsigned mismatch
-#endif
-
-#include <cstddef>
-
-namespace Catch {
-namespace Internal {
-
-    enum Operator {
-        IsEqualTo,
-        IsNotEqualTo,
-        IsLessThan,
-        IsGreaterThan,
-        IsLessThanOrEqualTo,
-        IsGreaterThanOrEqualTo
-    };
-
-    template<Operator Op> struct OperatorTraits             { static const char* getName(){ return "*error*"; } };
-    template<> struct OperatorTraits<IsEqualTo>             { static const char* getName(){ return "=="; } };
-    template<> struct OperatorTraits<IsNotEqualTo>          { static const char* getName(){ return "!="; } };
-    template<> struct OperatorTraits<IsLessThan>            { static const char* getName(){ return "<"; } };
-    template<> struct OperatorTraits<IsGreaterThan>         { static const char* getName(){ return ">"; } };
-    template<> struct OperatorTraits<IsLessThanOrEqualTo>   { static const char* getName(){ return "<="; } };
-    template<> struct OperatorTraits<IsGreaterThanOrEqualTo>{ static const char* getName(){ return ">="; } };
-
-    template<typename T>
-    inline T& opCast(T const& t) { return const_cast<T&>(t); }
-
-// nullptr_t support based on pull request #154 from Konstantin Baumann
-#ifdef CATCH_CONFIG_CPP11_NULLPTR
-    inline std::nullptr_t opCast(std::nullptr_t) { return nullptr; }
-#endif // CATCH_CONFIG_CPP11_NULLPTR
-
-    // So the compare overloads can be operator agnostic we convey the operator as a template
-    // enum, which is used to specialise an Evaluator for doing the comparison.
-    template<typename T1, typename T2, Operator Op>
-    class Evaluator{};
-
-    template<typename T1, typename T2>
-    struct Evaluator<T1, T2, IsEqualTo> {
-        static bool evaluate( T1 const& lhs, T2 const& rhs) {
-            return bool( opCast( lhs ) ==  opCast( rhs ) );
-        }
-    };
-    template<typename T1, typename T2>
-    struct Evaluator<T1, T2, IsNotEqualTo> {
-        static bool evaluate( T1 const& lhs, T2 const& rhs ) {
-            return bool( opCast( lhs ) != opCast( rhs ) );
-        }
-    };
-    template<typename T1, typename T2>
-    struct Evaluator<T1, T2, IsLessThan> {
-        static bool evaluate( T1 const& lhs, T2 const& rhs ) {
-            return bool( opCast( lhs ) < opCast( rhs ) );
-        }
-    };
-    template<typename T1, typename T2>
-    struct Evaluator<T1, T2, IsGreaterThan> {
-        static bool evaluate( T1 const& lhs, T2 const& rhs ) {
-            return bool( opCast( lhs ) > opCast( rhs ) );
-        }
-    };
-    template<typename T1, typename T2>
-    struct Evaluator<T1, T2, IsGreaterThanOrEqualTo> {
-        static bool evaluate( T1 const& lhs, T2 const& rhs ) {
-            return bool( opCast( lhs ) >= opCast( rhs ) );
-        }
-    };
-    template<typename T1, typename T2>
-    struct Evaluator<T1, T2, IsLessThanOrEqualTo> {
-        static bool evaluate( T1 const& lhs, T2 const& rhs ) {
-            return bool( opCast( lhs ) <= opCast( rhs ) );
-        }
-    };
-
-    template<Operator Op, typename T1, typename T2>
-    bool applyEvaluator( T1 const& lhs, T2 const& rhs ) {
-        return Evaluator<T1, T2, Op>::evaluate( lhs, rhs );
-    }
-
-    // This level of indirection allows us to specialise for integer types
-    // to avoid signed/ unsigned warnings
-
-    // "base" overload
-    template<Operator Op, typename T1, typename T2>
-    bool compare( T1 const& lhs, T2 const& rhs ) {
-        return Evaluator<T1, T2, Op>::evaluate( lhs, rhs );
-    }
-
-    // unsigned X to int
-    template<Operator Op> bool compare( unsigned int lhs, int rhs ) {
-        return applyEvaluator<Op>( lhs, static_cast<unsigned int>( rhs ) );
-    }
-    template<Operator Op> bool compare( unsigned long lhs, int rhs ) {
-        return applyEvaluator<Op>( lhs, static_cast<unsigned int>( rhs ) );
-    }
-    template<Operator Op> bool compare( unsigned char lhs, int rhs ) {
-        return applyEvaluator<Op>( lhs, static_cast<unsigned int>( rhs ) );
-    }
-
-    // unsigned X to long
-    template<Operator Op> bool compare( unsigned int lhs, long rhs ) {
-        return applyEvaluator<Op>( lhs, static_cast<unsigned long>( rhs ) );
-    }
-    template<Operator Op> bool compare( unsigned long lhs, long rhs ) {
-        return applyEvaluator<Op>( lhs, static_cast<unsigned long>( rhs ) );
-    }
-    template<Operator Op> bool compare( unsigned char lhs, long rhs ) {
-        return applyEvaluator<Op>( lhs, static_cast<unsigned long>( rhs ) );
-    }
-
-    // int to unsigned X
-    template<Operator Op> bool compare( int lhs, unsigned int rhs ) {
-        return applyEvaluator<Op>( static_cast<unsigned int>( lhs ), rhs );
-    }
-    template<Operator Op> bool compare( int lhs, unsigned long rhs ) {
-        return applyEvaluator<Op>( static_cast<unsigned int>( lhs ), rhs );
-    }
-    template<Operator Op> bool compare( int lhs, unsigned char rhs ) {
-        return applyEvaluator<Op>( static_cast<unsigned int>( lhs ), rhs );
-    }
-
-    // long to unsigned X
-    template<Operator Op> bool compare( long lhs, unsigned int rhs ) {
-        return applyEvaluator<Op>( static_cast<unsigned long>( lhs ), rhs );
-    }
-    template<Operator Op> bool compare( long lhs, unsigned long rhs ) {
-        return applyEvaluator<Op>( static_cast<unsigned long>( lhs ), rhs );
-    }
-    template<Operator Op> bool compare( long lhs, unsigned char rhs ) {
-        return applyEvaluator<Op>( static_cast<unsigned long>( lhs ), rhs );
-    }
-
-    // pointer to long (when comparing against NULL)
-    template<Operator Op, typename T> bool compare( long lhs, T* rhs ) {
-        return Evaluator<T*, T*, Op>::evaluate( reinterpret_cast<T*>( lhs ), rhs );
-    }
-    template<Operator Op, typename T> bool compare( T* lhs, long rhs ) {
-        return Evaluator<T*, T*, Op>::evaluate( lhs, reinterpret_cast<T*>( rhs ) );
-    }
-
-    // pointer to int (when comparing against NULL)
-    template<Operator Op, typename T> bool compare( int lhs, T* rhs ) {
-        return Evaluator<T*, T*, Op>::evaluate( reinterpret_cast<T*>( lhs ), rhs );
-    }
-    template<Operator Op, typename T> bool compare( T* lhs, int rhs ) {
-        return Evaluator<T*, T*, Op>::evaluate( lhs, reinterpret_cast<T*>( rhs ) );
-    }
-
-#ifdef CATCH_CONFIG_CPP11_LONG_LONG
-    // long long to unsigned X
-    template<Operator Op> bool compare( long long lhs, unsigned int rhs ) {
-        return applyEvaluator<Op>( static_cast<unsigned long>( lhs ), rhs );
-    }
-    template<Operator Op> bool compare( long long lhs, unsigned long rhs ) {
-        return applyEvaluator<Op>( static_cast<unsigned long>( lhs ), rhs );
-    }
-    template<Operator Op> bool compare( long long lhs, unsigned long long rhs ) {
-        return applyEvaluator<Op>( static_cast<unsigned long>( lhs ), rhs );
-    }
-    template<Operator Op> bool compare( long long lhs, unsigned char rhs ) {
-        return applyEvaluator<Op>( static_cast<unsigned long>( lhs ), rhs );
-    }
-
-    // unsigned long long to X
-    template<Operator Op> bool compare( unsigned long long lhs, int rhs ) {
-        return applyEvaluator<Op>( static_cast<long>( lhs ), rhs );
-    }
-    template<Operator Op> bool compare( unsigned long long lhs, long rhs ) {
-        return applyEvaluator<Op>( static_cast<long>( lhs ), rhs );
-    }
-    template<Operator Op> bool compare( unsigned long long lhs, long long rhs ) {
-        return applyEvaluator<Op>( static_cast<long>( lhs ), rhs );
-    }
-    template<Operator Op> bool compare( unsigned long long lhs, char rhs ) {
-        return applyEvaluator<Op>( static_cast<long>( lhs ), rhs );
-    }
-
-    // pointer to long long (when comparing against NULL)
-    template<Operator Op, typename T> bool compare( long long lhs, T* rhs ) {
-        return Evaluator<T*, T*, Op>::evaluate( reinterpret_cast<T*>( lhs ), rhs );
-    }
-    template<Operator Op, typename T> bool compare( T* lhs, long long rhs ) {
-        return Evaluator<T*, T*, Op>::evaluate( lhs, reinterpret_cast<T*>( rhs ) );
-    }
-#endif // CATCH_CONFIG_CPP11_LONG_LONG
-
-#ifdef CATCH_CONFIG_CPP11_NULLPTR
-    // pointer to nullptr_t (when comparing against nullptr)
-    template<Operator Op, typename T> bool compare( std::nullptr_t, T* rhs ) {
-        return Evaluator<T*, T*, Op>::evaluate( nullptr, rhs );
-    }
-    template<Operator Op, typename T> bool compare( T* lhs, std::nullptr_t ) {
-        return Evaluator<T*, T*, Op>::evaluate( lhs, nullptr );
-    }
-#endif // CATCH_CONFIG_CPP11_NULLPTR
-
-} // end of namespace Internal
-} // end of namespace Catch
-
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-
-// #included from: catch_tostring.h
-#define TWOBLUECUBES_CATCH_TOSTRING_H_INCLUDED
-
-#include <sstream>
-#include <iomanip>
-#include <limits>
-#include <vector>
-#include <cstddef>
-
-#ifdef __OBJC__
-// #included from: catch_objc_arc.hpp
-#define TWOBLUECUBES_CATCH_OBJC_ARC_HPP_INCLUDED
-
-#import <Foundation/Foundation.h>
-
-#ifdef __has_feature
-#define CATCH_ARC_ENABLED __has_feature(objc_arc)
-#else
-#define CATCH_ARC_ENABLED 0
-#endif
-
-void arcSafeRelease( NSObject* obj );
-id performOptionalSelector( id obj, SEL sel );
-
-#if !CATCH_ARC_ENABLED
-inline void arcSafeRelease( NSObject* obj ) {
-    [obj release];
-}
-inline id performOptionalSelector( id obj, SEL sel ) {
-    if( [obj respondsToSelector: sel] )
-        return [obj performSelector: sel];
-    return nil;
-}
-#define CATCH_UNSAFE_UNRETAINED
-#define CATCH_ARC_STRONG
-#else
-inline void arcSafeRelease( NSObject* ){}
-inline id performOptionalSelector( id obj, SEL sel ) {
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Warc-performSelector-leaks"
-#endif
-    if( [obj respondsToSelector: sel] )
-        return [obj performSelector: sel];
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-    return nil;
-}
-#define CATCH_UNSAFE_UNRETAINED __unsafe_unretained
-#define CATCH_ARC_STRONG __strong
-#endif
-
-#endif
-
-#ifdef CATCH_CONFIG_CPP11_TUPLE
-#include <tuple>
-#endif
-
-#ifdef CATCH_CONFIG_CPP11_IS_ENUM
-#include <type_traits>
-#endif
-
-namespace Catch {
-
-// Why we're here.
-template<typename T>
-std::string toString( T const& value );
-
-// Built in overloads
-
-std::string toString( std::string const& value );
-std::string toString( std::wstring const& value );
-std::string toString( const char* const value );
-std::string toString( char* const value );
-std::string toString( const wchar_t* const value );
-std::string toString( wchar_t* const value );
-std::string toString( int value );
-std::string toString( unsigned long value );
-std::string toString( unsigned int value );
-std::string toString( const double value );
-std::string toString( const float value );
-std::string toString( bool value );
-std::string toString( char value );
-std::string toString( signed char value );
-std::string toString( unsigned char value );
-
-#ifdef CATCH_CONFIG_CPP11_LONG_LONG
-std::string toString( long long value );
-std::string toString( unsigned long long value );
-#endif
-
-#ifdef CATCH_CONFIG_CPP11_NULLPTR
-std::string toString( std::nullptr_t );
-#endif
-
-#ifdef __OBJC__
-    std::string toString( NSString const * const& nsstring );
-    std::string toString( NSString * CATCH_ARC_STRONG const& nsstring );
-    std::string toString( NSObject* const& nsObject );
-#endif
-
-namespace Detail {
-
-    extern const std::string unprintableString;
-
-    struct BorgType {
-        template<typename T> BorgType( T const& );
-    };
-
-    struct TrueType { char sizer[1]; };
-    struct FalseType { char sizer[2]; };
-
-    TrueType& testStreamable( std::ostream& );
-    FalseType testStreamable( FalseType );
-
-    FalseType operator<<( std::ostream const&, BorgType const& );
-
-    template<typename T>
-    struct IsStreamInsertable {
-        static std::ostream &s;
-        static T  const&t;
-        enum { value = sizeof( testStreamable(s << t) ) == sizeof( TrueType ) };
-    };
-
-#if defined(CATCH_CONFIG_CPP11_IS_ENUM)
-    template<typename T,
-             bool IsEnum = std::is_enum<T>::value
-             >
-    struct EnumStringMaker
-    {
-        static std::string convert( T const& ) { return unprintableString; }
-    };
-
-    template<typename T>
-    struct EnumStringMaker<T,true>
-    {
-        static std::string convert( T const& v )
-        {
-            return ::Catch::toString(
-                static_cast<typename std::underlying_type<T>::type>(v)
-                );
-        }
-    };
-#endif
-    template<bool C>
-    struct StringMakerBase {
-#if defined(CATCH_CONFIG_CPP11_IS_ENUM)
-        template<typename T>
-        static std::string convert( T const& v )
-        {
-            return EnumStringMaker<T>::convert( v );
-        }
-#else
-        template<typename T>
-        static std::string convert( T const& ) { return unprintableString; }
-#endif
-    };
-
-    template<>
-    struct StringMakerBase<true> {
-        template<typename T>
-        static std::string convert( T const& _value ) {
-            std::ostringstream oss;
-            oss << _value;
-            return oss.str();
-        }
-    };
-
-    std::string rawMemoryToString( const void *object, std::size_t size );
-
-    template<typename T>
-    inline std::string rawMemoryToString( const T& object ) {
-      return rawMemoryToString( &object, sizeof(object) );
-    }
-
-} // end namespace Detail
-
-template<typename T>
-struct StringMaker :
-    Detail::StringMakerBase<Detail::IsStreamInsertable<T>::value> {};
-
-template<typename T>
-struct StringMaker<T*> {
-    template<typename U>
-    static std::string convert( U* p ) {
-        if( !p )
-            return "NULL";
-        else
-            return Detail::rawMemoryToString( p );
-    }
-};
-
-template<typename R, typename C>
-struct StringMaker<R C::*> {
-    static std::string convert( R C::* p ) {
-        if( !p )
-            return "NULL";
-        else
-            return Detail::rawMemoryToString( p );
-    }
-};
-
-namespace Detail {
-    template<typename InputIterator>
-    std::string rangeToString( InputIterator first, InputIterator last );
-}
-
-//template<typename T, typename Allocator>
-//struct StringMaker<std::vector<T, Allocator> > {
-//    static std::string convert( std::vector<T,Allocator> const& v ) {
-//        return Detail::rangeToString( v.begin(), v.end() );
-//    }
-//};
-
-template<typename T, typename Allocator>
-std::string toString( std::vector<T,Allocator> const& v ) {
-    return Detail::rangeToString( v.begin(), v.end() );
-}
-
-#ifdef CATCH_CONFIG_CPP11_TUPLE
-
-// toString for tuples
-namespace TupleDetail {
-  template<
-      typename Tuple,
-      std::size_t N = 0,
-      bool = (N < std::tuple_size<Tuple>::value)
-      >
-  struct ElementPrinter {
-      static void print( const Tuple& tuple, std::ostream& os )
-      {
-          os << ( N ? ", " : " " )
-             << Catch::toString(std::get<N>(tuple));
-          ElementPrinter<Tuple,N+1>::print(tuple,os);
-      }
-  };
-
-  template<
-      typename Tuple,
-      std::size_t N
-      >
-  struct ElementPrinter<Tuple,N,false> {
-      static void print( const Tuple&, std::ostream& ) {}
-  };
-
-}
-
-template<typename ...Types>
-struct StringMaker<std::tuple<Types...>> {
-
-    static std::string convert( const std::tuple<Types...>& tuple )
-    {
-        std::ostringstream os;
-        os << '{';
-        TupleDetail::ElementPrinter<std::tuple<Types...>>::print( tuple, os );
-        os << " }";
-        return os.str();
-    }
-};
-#endif // CATCH_CONFIG_CPP11_TUPLE
-
-namespace Detail {
-    template<typename T>
-    std::string makeString( T const& value ) {
-        return StringMaker<T>::convert( value );
-    }
-} // end namespace Detail
-
-/// \brief converts any type to a string
-///
-/// The default template forwards on to ostringstream - except when an
-/// ostringstream overload does not exist - in which case it attempts to detect
-/// that and writes {?}.
-/// Overload (not specialise) this template for custom typs that you don't want
-/// to provide an ostream overload for.
-template<typename T>
-std::string toString( T const& value ) {
-    return StringMaker<T>::convert( value );
-}
-
-    namespace Detail {
-    template<typename InputIterator>
-    std::string rangeToString( InputIterator first, InputIterator last ) {
-        std::ostringstream oss;
-        oss << "{ ";
-        if( first != last ) {
-            oss << Catch::toString( *first );
-            for( ++first ; first != last ; ++first )
-                oss << ", " << Catch::toString( *first );
-        }
-        oss << " }";
-        return oss.str();
-    }
-}
-
-} // end namespace Catch
-
-namespace Catch {
-
-// Wraps the LHS of an expression and captures the operator and RHS (if any) -
-// wrapping them all in a ResultBuilder object
-template<typename T>
-class ExpressionLhs {
-    ExpressionLhs& operator = ( ExpressionLhs const& );
-#  ifdef CATCH_CONFIG_CPP11_GENERATED_METHODS
-    ExpressionLhs& operator = ( ExpressionLhs && ) = delete;
-#  endif
-
-public:
-    ExpressionLhs( ResultBuilder& rb, T lhs ) : m_rb( rb ), m_lhs( lhs ) {}
-#  ifdef CATCH_CONFIG_CPP11_GENERATED_METHODS
-    ExpressionLhs( ExpressionLhs const& ) = default;
-    ExpressionLhs( ExpressionLhs && )     = default;
-#  endif
-
-    template<typename RhsT>
-    ResultBuilder& operator == ( RhsT const& rhs ) {
-        return captureExpression<Internal::IsEqualTo>( rhs );
-    }
-
-    template<typename RhsT>
-    ResultBuilder& operator != ( RhsT const& rhs ) {
-        return captureExpression<Internal::IsNotEqualTo>( rhs );
-    }
-
-    template<typename RhsT>
-    ResultBuilder& operator < ( RhsT const& rhs ) {
-        return captureExpression<Internal::IsLessThan>( rhs );
-    }
-
-    template<typename RhsT>
-    ResultBuilder& operator > ( RhsT const& rhs ) {
-        return captureExpression<Internal::IsGreaterThan>( rhs );
-    }
-
-    template<typename RhsT>
-    ResultBuilder& operator <= ( RhsT const& rhs ) {
-        return captureExpression<Internal::IsLessThanOrEqualTo>( rhs );
-    }
-
-    template<typename RhsT>
-    ResultBuilder& operator >= ( RhsT const& rhs ) {
-        return captureExpression<Internal::IsGreaterThanOrEqualTo>( rhs );
-    }
-
-    ResultBuilder& operator == ( bool rhs ) {
-        return captureExpression<Internal::IsEqualTo>( rhs );
-    }
-
-    ResultBuilder& operator != ( bool rhs ) {
-        return captureExpression<Internal::IsNotEqualTo>( rhs );
-    }
-
-    void endExpression() {
-        bool value = m_lhs ? true : false;
-        m_rb
-            .setLhs( Catch::toString( value ) )
-            .setResultType( value )
-            .endExpression();
-    }
-
-    // Only simple binary expressions are allowed on the LHS.
-    // If more complex compositions are required then place the sub expression in parentheses
-    template<typename RhsT> STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator + ( RhsT const& );
-    template<typename RhsT> STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator - ( RhsT const& );
-    template<typename RhsT> STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator / ( RhsT const& );
-    template<typename RhsT> STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator * ( RhsT const& );
-    template<typename RhsT> STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator && ( RhsT const& );
-    template<typename RhsT> STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator || ( RhsT const& );
-
-private:
-    template<Internal::Operator Op, typename RhsT>
-    ResultBuilder& captureExpression( RhsT const& rhs ) {
-        return m_rb
-            .setResultType( Internal::compare<Op>( m_lhs, rhs ) )
-            .setLhs( Catch::toString( m_lhs ) )
-            .setRhs( Catch::toString( rhs ) )
-            .setOp( Internal::OperatorTraits<Op>::getName() );
-    }
-
-private:
-    ResultBuilder& m_rb;
-    T m_lhs;
-};
-
-} // end namespace Catch
-
-
-namespace Catch {
-
-    template<typename T>
-    inline ExpressionLhs<T const&> ResultBuilder::operator <= ( T const& operand ) {
-        return ExpressionLhs<T const&>( *this, operand );
-    }
-
-    inline ExpressionLhs<bool> ResultBuilder::operator <= ( bool value ) {
-        return ExpressionLhs<bool>( *this, value );
-    }
-
-} // namespace Catch
-
-// #included from: catch_message.h
-#define TWOBLUECUBES_CATCH_MESSAGE_H_INCLUDED
-
-#include <string>
-
-namespace Catch {
-
-    struct MessageInfo {
-        MessageInfo(    std::string const& _macroName,
-                        SourceLineInfo const& _lineInfo,
-                        ResultWas::OfType _type );
-
-        std::string macroName;
-        SourceLineInfo lineInfo;
-        ResultWas::OfType type;
-        std::string message;
-        unsigned int sequence;
-
-        bool operator == ( MessageInfo const& other ) const {
-            return sequence == other.sequence;
-        }
-        bool operator < ( MessageInfo const& other ) const {
-            return sequence < other.sequence;
-        }
-    private:
-        static unsigned int globalCount;
-    };
-
-    struct MessageBuilder {
-        MessageBuilder( std::string const& macroName,
-                        SourceLineInfo const& lineInfo,
-                        ResultWas::OfType type )
-        : m_info( macroName, lineInfo, type )
-        {}
-
-        template<typename T>
-        MessageBuilder& operator << ( T const& value ) {
-            m_stream << value;
-            return *this;
-        }
-
-        MessageInfo m_info;
-        std::ostringstream m_stream;
-    };
-
-    class ScopedMessage {
-    public:
-        ScopedMessage( MessageBuilder const& builder );
-        ScopedMessage( ScopedMessage const& other );
-        ~ScopedMessage();
-
-        MessageInfo m_info;
-    };
-
-} // end namespace Catch
-
-// #included from: catch_interfaces_capture.h
-#define TWOBLUECUBES_CATCH_INTERFACES_CAPTURE_H_INCLUDED
-
-#include <string>
-
-namespace Catch {
-
-    class TestCase;
-    class AssertionResult;
-    struct AssertionInfo;
-    struct SectionInfo;
-    struct SectionEndInfo;
-    struct MessageInfo;
-    class ScopedMessageBuilder;
-    struct Counts;
-
-    struct IResultCapture {
-
-        virtual ~IResultCapture();
-
-        virtual void assertionEnded( AssertionResult const& result ) = 0;
-        virtual bool sectionStarted(    SectionInfo const& sectionInfo,
-                                        Counts& assertions ) = 0;
-        virtual void sectionEnded( SectionEndInfo const& endInfo ) = 0;
-        virtual void sectionEndedEarly( SectionEndInfo const& endInfo ) = 0;
-        virtual void pushScopedMessage( MessageInfo const& message ) = 0;
-        virtual void popScopedMessage( MessageInfo const& message ) = 0;
-
-        virtual std::string getCurrentTestName() const = 0;
-        virtual const AssertionResult* getLastResult() const = 0;
-
-        virtual void handleFatalErrorCondition( std::string const& message ) = 0;
-    };
-
-    IResultCapture& getResultCapture();
-}
-
-// #included from: catch_debugger.h
-#define TWOBLUECUBES_CATCH_DEBUGGER_H_INCLUDED
-
-// #included from: catch_platform.h
-#define TWOBLUECUBES_CATCH_PLATFORM_H_INCLUDED
-
-#if defined(__MAC_OS_X_VERSION_MIN_REQUIRED)
-#define CATCH_PLATFORM_MAC
-#elif  defined(__IPHONE_OS_VERSION_MIN_REQUIRED)
-#define CATCH_PLATFORM_IPHONE
-#elif defined(WIN32) || defined(__WIN32__) || defined(_WIN32) || defined(_MSC_VER)
-#define CATCH_PLATFORM_WINDOWS
-#endif
-
-#include <string>
-
-namespace Catch{
-
-    bool isDebuggerActive();
-    void writeToDebugConsole( std::string const& text );
-}
-
-#ifdef CATCH_PLATFORM_MAC
-
-    // The following code snippet based on:
-    // http://cocoawithlove.com/2008/03/break-into-debugger.html
-    #ifdef DEBUG
-        #if defined(__ppc64__) || defined(__ppc__)
-            #define CATCH_BREAK_INTO_DEBUGGER() \
-                if( Catch::isDebuggerActive() ) { \
-                    __asm__("li r0, 20\nsc\nnop\nli r0, 37\nli r4, 2\nsc\nnop\n" \
-                    : : : "memory","r0","r3","r4" ); \
-                }
-        #else
-            #define CATCH_BREAK_INTO_DEBUGGER() if( Catch::isDebuggerActive() ) {__asm__("int $3\n" : : );}
-        #endif
-    #endif
-
-#elif defined(_MSC_VER)
-    #define CATCH_BREAK_INTO_DEBUGGER() if( Catch::isDebuggerActive() ) { __debugbreak(); }
-#elif defined(__MINGW32__)
-    extern "C" __declspec(dllimport) void __stdcall DebugBreak();
-    #define CATCH_BREAK_INTO_DEBUGGER() if( Catch::isDebuggerActive() ) { DebugBreak(); }
-#endif
-
-#ifndef CATCH_BREAK_INTO_DEBUGGER
-#define CATCH_BREAK_INTO_DEBUGGER() Catch::alwaysTrue();
-#endif
-
-// #included from: catch_interfaces_runner.h
-#define TWOBLUECUBES_CATCH_INTERFACES_RUNNER_H_INCLUDED
-
-namespace Catch {
-    class TestCase;
-
-    struct IRunner {
-        virtual ~IRunner();
-        virtual bool aborting() const = 0;
-    };
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// In the event of a failure works out if the debugger needs to be invoked
-// and/or an exception thrown and takes appropriate action.
-// This needs to be done as a macro so the debugger will stop in the user
-// source code rather than in Catch library code
-#define INTERNAL_CATCH_REACT( resultBuilder ) \
-    if( resultBuilder.shouldDebugBreak() ) CATCH_BREAK_INTO_DEBUGGER(); \
-    resultBuilder.react();
-
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_TEST( expr, resultDisposition, macroName ) \
-    do { \
-        Catch::ResultBuilder __catchResult( macroName, CATCH_INTERNAL_LINEINFO, #expr, resultDisposition ); \
-        try { \
-            CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS \
-            ( __catchResult <= expr ).endExpression(); \
-        } \
-        catch( ... ) { \
-            __catchResult.useActiveException( Catch::ResultDisposition::Normal ); \
-        } \
-        INTERNAL_CATCH_REACT( __catchResult ) \
-    } while( Catch::isTrue( false && static_cast<bool>(expr) ) ) // expr here is never evaluated at runtime but it forces the compiler to give it a look
-
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_IF( expr, resultDisposition, macroName ) \
-    INTERNAL_CATCH_TEST( expr, resultDisposition, macroName ); \
-    if( Catch::getResultCapture().getLastResult()->succeeded() )
-
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_ELSE( expr, resultDisposition, macroName ) \
-    INTERNAL_CATCH_TEST( expr, resultDisposition, macroName ); \
-    if( !Catch::getResultCapture().getLastResult()->succeeded() )
-
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_NO_THROW( expr, resultDisposition, macroName ) \
-    do { \
-        Catch::ResultBuilder __catchResult( macroName, CATCH_INTERNAL_LINEINFO, #expr, resultDisposition ); \
-        try { \
-            expr; \
-            __catchResult.captureResult( Catch::ResultWas::Ok ); \
-        } \
-        catch( ... ) { \
-            __catchResult.useActiveException( resultDisposition ); \
-        } \
-        INTERNAL_CATCH_REACT( __catchResult ) \
-    } while( Catch::alwaysFalse() )
-
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_THROWS( expr, resultDisposition, matcher, macroName ) \
-    do { \
-        Catch::ResultBuilder __catchResult( macroName, CATCH_INTERNAL_LINEINFO, #expr, resultDisposition, #matcher ); \
-        if( __catchResult.allowThrows() ) \
-            try { \
-                expr; \
-                __catchResult.captureResult( Catch::ResultWas::DidntThrowException ); \
-            } \
-            catch( ... ) { \
-                __catchResult.captureExpectedException( matcher ); \
-            } \
-        else \
-            __catchResult.captureResult( Catch::ResultWas::Ok ); \
-        INTERNAL_CATCH_REACT( __catchResult ) \
-    } while( Catch::alwaysFalse() )
-
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_THROWS_AS( expr, exceptionType, resultDisposition, macroName ) \
-    do { \
-        Catch::ResultBuilder __catchResult( macroName, CATCH_INTERNAL_LINEINFO, #expr, resultDisposition ); \
-        if( __catchResult.allowThrows() ) \
-            try { \
-                expr; \
-                __catchResult.captureResult( Catch::ResultWas::DidntThrowException ); \
-            } \
-            catch( exceptionType ) { \
-                __catchResult.captureResult( Catch::ResultWas::Ok ); \
-            } \
-            catch( ... ) { \
-                __catchResult.useActiveException( resultDisposition ); \
-            } \
-        else \
-            __catchResult.captureResult( Catch::ResultWas::Ok ); \
-        INTERNAL_CATCH_REACT( __catchResult ) \
-    } while( Catch::alwaysFalse() )
-
-///////////////////////////////////////////////////////////////////////////////
-#ifdef CATCH_CONFIG_VARIADIC_MACROS
-    #define INTERNAL_CATCH_MSG( messageType, resultDisposition, macroName, ... ) \
-        do { \
-            Catch::ResultBuilder __catchResult( macroName, CATCH_INTERNAL_LINEINFO, "", resultDisposition ); \
-            __catchResult << __VA_ARGS__ + ::Catch::StreamEndStop(); \
-            __catchResult.captureResult( messageType ); \
-            INTERNAL_CATCH_REACT( __catchResult ) \
-        } while( Catch::alwaysFalse() )
-#else
-    #define INTERNAL_CATCH_MSG( messageType, resultDisposition, macroName, log ) \
-        do { \
-            Catch::ResultBuilder __catchResult( macroName, CATCH_INTERNAL_LINEINFO, "", resultDisposition ); \
-            __catchResult << log + ::Catch::StreamEndStop(); \
-            __catchResult.captureResult( messageType ); \
-            INTERNAL_CATCH_REACT( __catchResult ) \
-        } while( Catch::alwaysFalse() )
-#endif
-
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_INFO( log, macroName ) \
-    Catch::ScopedMessage INTERNAL_CATCH_UNIQUE_NAME( scopedMessage ) = Catch::MessageBuilder( macroName, CATCH_INTERNAL_LINEINFO, Catch::ResultWas::Info ) << log;
-
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CHECK_THAT( arg, matcher, resultDisposition, macroName ) \
-    do { \
-        Catch::ResultBuilder __catchResult( macroName, CATCH_INTERNAL_LINEINFO, #arg ", " #matcher, resultDisposition ); \
-        try { \
-            std::string matcherAsString = (matcher).toString(); \
-            __catchResult \
-                .setLhs( Catch::toString( arg ) ) \
-                .setRhs( matcherAsString == Catch::Detail::unprintableString ? #matcher : matcherAsString ) \
-                .setOp( "matches" ) \
-                .setResultType( (matcher).match( arg ) ); \
-            __catchResult.captureExpression(); \
-        } catch( ... ) { \
-            __catchResult.useActiveException( resultDisposition | Catch::ResultDisposition::ContinueOnFailure ); \
-        } \
-        INTERNAL_CATCH_REACT( __catchResult ) \
-    } while( Catch::alwaysFalse() )
-
-// #included from: internal/catch_section.h
-#define TWOBLUECUBES_CATCH_SECTION_H_INCLUDED
-
-// #included from: catch_section_info.h
-#define TWOBLUECUBES_CATCH_SECTION_INFO_H_INCLUDED
-
-// #included from: catch_totals.hpp
-#define TWOBLUECUBES_CATCH_TOTALS_HPP_INCLUDED
-
-#include <cstddef>
-
-namespace Catch {
-
-    struct Counts {
-        Counts() : passed( 0 ), failed( 0 ), failedButOk( 0 ) {}
-
-        Counts operator - ( Counts const& other ) const {
-            Counts diff;
-            diff.passed = passed - other.passed;
-            diff.failed = failed - other.failed;
-            diff.failedButOk = failedButOk - other.failedButOk;
-            return diff;
-        }
-        Counts& operator += ( Counts const& other ) {
-            passed += other.passed;
-            failed += other.failed;
-            failedButOk += other.failedButOk;
-            return *this;
-        }
-
-        std::size_t total() const {
-            return passed + failed + failedButOk;
-        }
-        bool allPassed() const {
-            return failed == 0 && failedButOk == 0;
-        }
-        bool allOk() const {
-            return failed == 0;
-        }
-
-        std::size_t passed;
-        std::size_t failed;
-        std::size_t failedButOk;
-    };
-
-    struct Totals {
-
-        Totals operator - ( Totals const& other ) const {
-            Totals diff;
-            diff.assertions = assertions - other.assertions;
-            diff.testCases = testCases - other.testCases;
-            return diff;
-        }
-
-        Totals delta( Totals const& prevTotals ) const {
-            Totals diff = *this - prevTotals;
-            if( diff.assertions.failed > 0 )
-                ++diff.testCases.failed;
-            else if( diff.assertions.failedButOk > 0 )
-                ++diff.testCases.failedButOk;
-            else
-                ++diff.testCases.passed;
-            return diff;
-        }
-
-        Totals& operator += ( Totals const& other ) {
-            assertions += other.assertions;
-            testCases += other.testCases;
-            return *this;
-        }
-
-        Counts assertions;
-        Counts testCases;
-    };
-}
-
-namespace Catch {
-
-    struct SectionInfo {
-        SectionInfo
-            (   SourceLineInfo const& _lineInfo,
-                std::string const& _name,
-                std::string const& _description = std::string() );
-
-        std::string name;
-        std::string description;
-        SourceLineInfo lineInfo;
-    };
-
-    struct SectionEndInfo {
-        SectionEndInfo( SectionInfo const& _sectionInfo, Counts const& _prevAssertions, double _durationInSeconds )
-        : sectionInfo( _sectionInfo ), prevAssertions( _prevAssertions ), durationInSeconds( _durationInSeconds )
-        {}
-
-        SectionInfo sectionInfo;
-        Counts prevAssertions;
-        double durationInSeconds;
-    };
-
-} // end namespace Catch
-
-// #included from: catch_timer.h
-#define TWOBLUECUBES_CATCH_TIMER_H_INCLUDED
-
-#ifdef CATCH_PLATFORM_WINDOWS
-typedef unsigned long long uint64_t;
-#else
-#include <stdint.h>
-#endif
-
-namespace Catch {
-
-    class Timer {
-    public:
-        Timer() : m_ticks( 0 ) {}
-        void start();
-        unsigned int getElapsedMicroseconds() const;
-        unsigned int getElapsedMilliseconds() const;
-        double getElapsedSeconds() const;
-
-    private:
-        uint64_t m_ticks;
-    };
-
-} // namespace Catch
-
-#include <string>
-
-namespace Catch {
-
-    class Section : NonCopyable {
-    public:
-        Section( SectionInfo const& info );
-        ~Section();
-
-        // This indicates whether the section should be executed or not
-        operator bool() const;
-
-    private:
-        SectionInfo m_info;
-
-        std::string m_name;
-        Counts m_assertions;
-        bool m_sectionIncluded;
-        Timer m_timer;
-    };
-
-} // end namespace Catch
-
-#ifdef CATCH_CONFIG_VARIADIC_MACROS
-    #define INTERNAL_CATCH_SECTION( ... ) \
-        if( Catch::Section const& INTERNAL_CATCH_UNIQUE_NAME( catch_internal_Section ) = Catch::SectionInfo( CATCH_INTERNAL_LINEINFO, __VA_ARGS__ ) )
-#else
-    #define INTERNAL_CATCH_SECTION( name, desc ) \
-        if( Catch::Section const& INTERNAL_CATCH_UNIQUE_NAME( catch_internal_Section ) = Catch::SectionInfo( CATCH_INTERNAL_LINEINFO, name, desc ) )
-#endif
-
-// #included from: internal/catch_generators.hpp
-#define TWOBLUECUBES_CATCH_GENERATORS_HPP_INCLUDED
-
-#include <iterator>
-#include <vector>
-#include <string>
-#include <stdlib.h>
-
-namespace Catch {
-
-template<typename T>
-struct IGenerator {
-    virtual ~IGenerator() {}
-    virtual T getValue( std::size_t index ) const = 0;
-    virtual std::size_t size () const = 0;
-};
-
-template<typename T>
-class BetweenGenerator : public IGenerator<T> {
-public:
-    BetweenGenerator( T from, T to ) : m_from( from ), m_to( to ){}
-
-    virtual T getValue( std::size_t index ) const {
-        return m_from+static_cast<int>( index );
-    }
-
-    virtual std::size_t size() const {
-        return static_cast<std::size_t>( 1+m_to-m_from );
-    }
-
-private:
-
-    T m_from;
-    T m_to;
-};
-
-template<typename T>
-class ValuesGenerator : public IGenerator<T> {
-public:
-    ValuesGenerator(){}
-
-    void add( T value ) {
-        m_values.push_back( value );
-    }
-
-    virtual T getValue( std::size_t index ) const {
-        return m_values[index];
-    }
-
-    virtual std::size_t size() const {
-        return m_values.size();
-    }
-
-private:
-    std::vector<T> m_values;
-};
-
-template<typename T>
-class CompositeGenerator {
-public:
-    CompositeGenerator() : m_totalSize( 0 ) {}
-
-    // *** Move semantics, similar to auto_ptr ***
-    CompositeGenerator( CompositeGenerator& other )
-    :   m_fileInfo( other.m_fileInfo ),
-        m_totalSize( 0 )
-    {
-        move( other );
-    }
-
-    CompositeGenerator& setFileInfo( const char* fileInfo ) {
-        m_fileInfo = fileInfo;
-        return *this;
-    }
-
-    ~CompositeGenerator() {
-        deleteAll( m_composed );
-    }
-
-    operator T () const {
-        size_t overallIndex = getCurrentContext().getGeneratorIndex( m_fileInfo, m_totalSize );
-
-        typename std::vector<const IGenerator<T>*>::const_iterator it = m_composed.begin();
-        typename std::vector<const IGenerator<T>*>::const_iterator itEnd = m_composed.end();
-        for( size_t index = 0; it != itEnd; ++it )
-        {
-            const IGenerator<T>* generator = *it;
-            if( overallIndex >= index && overallIndex < index + generator->size() )
-            {
-                return generator->getValue( overallIndex-index );
-            }
-            index += generator->size();
-        }
-        CATCH_INTERNAL_ERROR( "Indexed past end of generated range" );
-        return T(); // Suppress spurious "not all control paths return a value" warning in Visual Studio - if you know how to fix this please do so
-    }
-
-    void add( const IGenerator<T>* generator ) {
-        m_totalSize += generator->size();
-        m_composed.push_back( generator );
-    }
-
-    CompositeGenerator& then( CompositeGenerator& other ) {
-        move( other );
-        return *this;
-    }
-
-    CompositeGenerator& then( T value ) {
-        ValuesGenerator<T>* valuesGen = new ValuesGenerator<T>();
-        valuesGen->add( value );
-        add( valuesGen );
-        return *this;
-    }
-
-private:
-
-    void move( CompositeGenerator& other ) {
-        std::copy( other.m_composed.begin(), other.m_composed.end(), std::back_inserter( m_composed ) );
-        m_totalSize += other.m_totalSize;
-        other.m_composed.clear();
-    }
-
-    std::vector<const IGenerator<T>*> m_composed;
-    std::string m_fileInfo;
-    size_t m_totalSize;
-};
-
-namespace Generators
-{
-    template<typename T>
-    CompositeGenerator<T> between( T from, T to ) {
-        CompositeGenerator<T> generators;
-        generators.add( new BetweenGenerator<T>( from, to ) );
-        return generators;
-    }
-
-    template<typename T>
-    CompositeGenerator<T> values( T val1, T val2 ) {
-        CompositeGenerator<T> generators;
-        ValuesGenerator<T>* valuesGen = new ValuesGenerator<T>();
-        valuesGen->add( val1 );
-        valuesGen->add( val2 );
-        generators.add( valuesGen );
-        return generators;
-    }
-
-    template<typename T>
-    CompositeGenerator<T> values( T val1, T val2, T val3 ){
-        CompositeGenerator<T> generators;
-        ValuesGenerator<T>* valuesGen = new ValuesGenerator<T>();
-        valuesGen->add( val1 );
-        valuesGen->add( val2 );
-        valuesGen->add( val3 );
-        generators.add( valuesGen );
-        return generators;
-    }
-
-    template<typename T>
-    CompositeGenerator<T> values( T val1, T val2, T val3, T val4 ) {
-        CompositeGenerator<T> generators;
-        ValuesGenerator<T>* valuesGen = new ValuesGenerator<T>();
-        valuesGen->add( val1 );
-        valuesGen->add( val2 );
-        valuesGen->add( val3 );
-        valuesGen->add( val4 );
-        generators.add( valuesGen );
-        return generators;
-    }
-
-} // end namespace Generators
-
-using namespace Generators;
-
-} // end namespace Catch
-
-#define INTERNAL_CATCH_LINESTR2( line ) #line
-#define INTERNAL_CATCH_LINESTR( line ) INTERNAL_CATCH_LINESTR2( line )
-
-#define INTERNAL_CATCH_GENERATE( expr ) expr.setFileInfo( __FILE__ "(" INTERNAL_CATCH_LINESTR( __LINE__ ) ")" )
-
-// #included from: internal/catch_interfaces_exception.h
-#define TWOBLUECUBES_CATCH_INTERFACES_EXCEPTION_H_INCLUDED
-
-#include <string>
-#include <vector>
-
-// #included from: catch_interfaces_registry_hub.h
-#define TWOBLUECUBES_CATCH_INTERFACES_REGISTRY_HUB_H_INCLUDED
-
-#include <string>
-
-namespace Catch {
-
-    class TestCase;
-    struct ITestCaseRegistry;
-    struct IExceptionTranslatorRegistry;
-    struct IExceptionTranslator;
-    struct IReporterRegistry;
-    struct IReporterFactory;
-
-    struct IRegistryHub {
-        virtual ~IRegistryHub();
-
-        virtual IReporterRegistry const& getReporterRegistry() const = 0;
-        virtual ITestCaseRegistry const& getTestCaseRegistry() const = 0;
-        virtual IExceptionTranslatorRegistry& getExceptionTranslatorRegistry() = 0;
-    };
-
-    struct IMutableRegistryHub {
-        virtual ~IMutableRegistryHub();
-        virtual void registerReporter( std::string const& name, Ptr<IReporterFactory> const& factory ) = 0;
-        virtual void registerListener( Ptr<IReporterFactory> const& factory ) = 0;
-        virtual void registerTest( TestCase const& testInfo ) = 0;
-        virtual void registerTranslator( const IExceptionTranslator* translator ) = 0;
-    };
-
-    IRegistryHub& getRegistryHub();
-    IMutableRegistryHub& getMutableRegistryHub();
-    void cleanUp();
-    std::string translateActiveException();
-
-}
-
-namespace Catch {
-
-    typedef std::string(*exceptionTranslateFunction)();
-
-    struct IExceptionTranslator;
-    typedef std::vector<const IExceptionTranslator*> ExceptionTranslators;
-
-    struct IExceptionTranslator {
-        virtual ~IExceptionTranslator();
-        virtual std::string translate( ExceptionTranslators::const_iterator it, ExceptionTranslators::const_iterator itEnd ) const = 0;
-    };
-
-    struct IExceptionTranslatorRegistry {
-        virtual ~IExceptionTranslatorRegistry();
-
-        virtual std::string translateActiveException() const = 0;
-    };
-
-    class ExceptionTranslatorRegistrar {
-        template<typename T>
-        class ExceptionTranslator : public IExceptionTranslator {
-        public:
-
-            ExceptionTranslator( std::string(*translateFunction)( T& ) )
-            : m_translateFunction( translateFunction )
-            {}
-
-            virtual std::string translate( ExceptionTranslators::const_iterator it, ExceptionTranslators::const_iterator itEnd ) const CATCH_OVERRIDE {
-                try {
-                    if( it == itEnd )
-                        throw;
-                    else
-                        return (*it)->translate( it+1, itEnd );
-                }
-                catch( T& ex ) {
-                    return m_translateFunction( ex );
-                }
-            }
-
-        protected:
-            std::string(*m_translateFunction)( T& );
-        };
-
-    public:
-        template<typename T>
-        ExceptionTranslatorRegistrar( std::string(*translateFunction)( T& ) ) {
-            getMutableRegistryHub().registerTranslator
-                ( new ExceptionTranslator<T>( translateFunction ) );
-        }
-    };
-}
-
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_TRANSLATE_EXCEPTION2( translatorName, signature ) \
-    static std::string translatorName( signature ); \
-    namespace{ Catch::ExceptionTranslatorRegistrar INTERNAL_CATCH_UNIQUE_NAME( catch_internal_ExceptionRegistrar )( &translatorName ); }\
-    static std::string translatorName( signature )
-
-#define INTERNAL_CATCH_TRANSLATE_EXCEPTION( signature ) INTERNAL_CATCH_TRANSLATE_EXCEPTION2( INTERNAL_CATCH_UNIQUE_NAME( catch_internal_ExceptionTranslator ), signature )
-
-// #included from: internal/catch_approx.hpp
-#define TWOBLUECUBES_CATCH_APPROX_HPP_INCLUDED
-
-#include <cmath>
-#include <limits>
-
-namespace Catch {
-namespace Detail {
-
-    class Approx {
-    public:
-        explicit Approx ( double value )
-        :   m_epsilon( std::numeric_limits<float>::epsilon()*100 ),
-            m_scale( 1.0 ),
-            m_value( value )
-        {}
-
-        Approx( Approx const& other )
-        :   m_epsilon( other.m_epsilon ),
-            m_scale( other.m_scale ),
-            m_value( other.m_value )
-        {}
-
-        static Approx custom() {
-            return Approx( 0 );
-        }
-
-        Approx operator()( double value ) {
-            Approx approx( value );
-            approx.epsilon( m_epsilon );
-            approx.scale( m_scale );
-            return approx;
-        }
-
-        friend bool operator == ( double lhs, Approx const& rhs ) {
-            // Thanks to Richard Harris for his help refining this formula
-            return fabs( lhs - rhs.m_value ) < rhs.m_epsilon * (rhs.m_scale + (std::max)( fabs(lhs), fabs(rhs.m_value) ) );
-        }
-
-        friend bool operator == ( Approx const& lhs, double rhs ) {
-            return operator==( rhs, lhs );
-        }
-
-        friend bool operator != ( double lhs, Approx const& rhs ) {
-            return !operator==( lhs, rhs );
-        }
-
-        friend bool operator != ( Approx const& lhs, double rhs ) {
-            return !operator==( rhs, lhs );
-        }
-
-        Approx& epsilon( double newEpsilon ) {
-            m_epsilon = newEpsilon;
-            return *this;
-        }
-
-        Approx& scale( double newScale ) {
-            m_scale = newScale;
-            return *this;
-        }
-
-        std::string toString() const {
-            std::ostringstream oss;
-            oss << "Approx( " << Catch::toString( m_value ) << " )";
-            return oss.str();
-        }
-
-    private:
-        double m_epsilon;
-        double m_scale;
-        double m_value;
-    };
-}
-
-template<>
-inline std::string toString<Detail::Approx>( Detail::Approx const& value ) {
-    return value.toString();
-}
-
-} // end namespace Catch
-
-// #included from: internal/catch_interfaces_tag_alias_registry.h
-#define TWOBLUECUBES_CATCH_INTERFACES_TAG_ALIAS_REGISTRY_H_INCLUDED
-
-// #included from: catch_tag_alias.h
-#define TWOBLUECUBES_CATCH_TAG_ALIAS_H_INCLUDED
-
-#include <string>
-
-namespace Catch {
-
-    struct TagAlias {
-        TagAlias( std::string _tag, SourceLineInfo _lineInfo ) : tag( _tag ), lineInfo( _lineInfo ) {}
-
-        std::string tag;
-        SourceLineInfo lineInfo;
-    };
-
-    struct RegistrarForTagAliases {
-        RegistrarForTagAliases( char const* alias, char const* tag, SourceLineInfo const& lineInfo );
-    };
-
-} // end namespace Catch
-
-#define CATCH_REGISTER_TAG_ALIAS( alias, spec ) namespace{ Catch::RegistrarForTagAliases INTERNAL_CATCH_UNIQUE_NAME( AutoRegisterTagAlias )( alias, spec, CATCH_INTERNAL_LINEINFO ); }
-// #included from: catch_option.hpp
-#define TWOBLUECUBES_CATCH_OPTION_HPP_INCLUDED
-
-namespace Catch {
-
-    // An optional type
-    template<typename T>
-    class Option {
-    public:
-        Option() : nullableValue( CATCH_NULL ) {}
-        Option( T const& _value )
-        : nullableValue( new( storage ) T( _value ) )
-        {}
-        Option( Option const& _other )
-        : nullableValue( _other ? new( storage ) T( *_other ) : CATCH_NULL )
-        {}
-
-        ~Option() {
-            reset();
-        }
-
-        Option& operator= ( Option const& _other ) {
-            if( &_other != this ) {
-                reset();
-                if( _other )
-                    nullableValue = new( storage ) T( *_other );
-            }
-            return *this;
-        }
-        Option& operator = ( T const& _value ) {
-            reset();
-            nullableValue = new( storage ) T( _value );
-            return *this;
-        }
-
-        void reset() {
-            if( nullableValue )
-                nullableValue->~T();
-            nullableValue = CATCH_NULL;
-        }
-
-        T& operator*() { return *nullableValue; }
-        T const& operator*() const { return *nullableValue; }
-        T* operator->() { return nullableValue; }
-        const T* operator->() const { return nullableValue; }
-
-        T valueOr( T const& defaultValue ) const {
-            return nullableValue ? *nullableValue : defaultValue;
-        }
-
-        bool some() const { return nullableValue != CATCH_NULL; }
-        bool none() const { return nullableValue == CATCH_NULL; }
-
-        bool operator !() const { return nullableValue == CATCH_NULL; }
-        operator SafeBool::type() const {
-            return SafeBool::makeSafe( some() );
-        }
-
-    private:
-        T* nullableValue;
-        char storage[sizeof(T)];
-    };
-
-} // end namespace Catch
-
-namespace Catch {
-
-    struct ITagAliasRegistry {
-        virtual ~ITagAliasRegistry();
-        virtual Option<TagAlias> find( std::string const& alias ) const = 0;
-        virtual std::string expandAliases( std::string const& unexpandedTestSpec ) const = 0;
-
-        static ITagAliasRegistry const& get();
-    };
-
-} // end namespace Catch
-
-// These files are included here so the single_include script doesn't put them
-// in the conditionally compiled sections
-// #included from: internal/catch_test_case_info.h
-#define TWOBLUECUBES_CATCH_TEST_CASE_INFO_H_INCLUDED
-
-#include <string>
-#include <set>
-
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wpadded"
-#endif
-
-namespace Catch {
-
-    struct ITestCase;
-
-    struct TestCaseInfo {
-        enum SpecialProperties{
-            None = 0,
-            IsHidden = 1 << 1,
-            ShouldFail = 1 << 2,
-            MayFail = 1 << 3,
-            Throws = 1 << 4
-        };
-
-        TestCaseInfo(   std::string const& _name,
-                        std::string const& _className,
-                        std::string const& _description,
-                        std::set<std::string> const& _tags,
-                        SourceLineInfo const& _lineInfo );
-
-        TestCaseInfo( TestCaseInfo const& other );
-
-        friend void setTags( TestCaseInfo& testCaseInfo, std::set<std::string> const& tags );
-
-        bool isHidden() const;
-        bool throws() const;
-        bool okToFail() const;
-        bool expectedToFail() const;
-
-        std::string name;
-        std::string className;
-        std::string description;
-        std::set<std::string> tags;
-        std::set<std::string> lcaseTags;
-        std::string tagsAsString;
-        SourceLineInfo lineInfo;
-        SpecialProperties properties;
-    };
-
-    class TestCase : public TestCaseInfo {
-    public:
-
-        TestCase( ITestCase* testCase, TestCaseInfo const& info );
-        TestCase( TestCase const& other );
-
-        TestCase withName( std::string const& _newName ) const;
-
-        void invoke() const;
-
-        TestCaseInfo const& getTestCaseInfo() const;
-
-        void swap( TestCase& other );
-        bool operator == ( TestCase const& other ) const;
-        bool operator < ( TestCase const& other ) const;
-        TestCase& operator = ( TestCase const& other );
-
-    private:
-        Ptr<ITestCase> test;
-    };
-
-    TestCase makeTestCase(  ITestCase* testCase,
-                            std::string const& className,
-                            std::string const& name,
-                            std::string const& description,
-                            SourceLineInfo const& lineInfo );
-}
-
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
-
-#ifdef __OBJC__
-// #included from: internal/catch_objc.hpp
-#define TWOBLUECUBES_CATCH_OBJC_HPP_INCLUDED
-
-#import <objc/runtime.h>
-
-#include <string>
-
-// NB. Any general catch headers included here must be included
-// in catch.hpp first to make sure they are included by the single
-// header for non obj-usage
-
-///////////////////////////////////////////////////////////////////////////////
-// This protocol is really only here for (self) documenting purposes, since
-// all its methods are optional.
-@protocol OcFixture
-
-@optional
-
--(void) setUp;
--(void) tearDown;
-
-@end
-
-namespace Catch {
-
-    class OcMethod : public SharedImpl<ITestCase> {
-
-    public:
-        OcMethod( Class cls, SEL sel ) : m_cls( cls ), m_sel( sel ) {}
-
-        virtual void invoke() const {
-            id obj = [[m_cls alloc] init];
-
-            performOptionalSelector( obj, @selector(setUp)  );
-            performOptionalSelector( obj, m_sel );
-            performOptionalSelector( obj, @selector(tearDown)  );
-
-            arcSafeRelease( obj );
-        }
-    private:
-        virtual ~OcMethod() {}
-
-        Class m_cls;
-        SEL m_sel;
-    };
-
-    namespace Detail{
-
-        inline std::string getAnnotation(   Class cls,
-                                            std::string const& annotationName,
-                                            std::string const& testCaseName ) {
-            NSString* selStr = [[NSString alloc] initWithFormat:@"Catch_%s_%s", annotationName.c_str(), testCaseName.c_str()];
-            SEL sel = NSSelectorFromString( selStr );
-            arcSafeRelease( selStr );
-            id value = performOptionalSelector( cls, sel );
-            if( value )
-                return [(NSString*)value UTF8String];
-            return "";
-        }
-    }
-
-    inline size_t registerTestMethods() {
-        size_t noTestMethods = 0;
-        int noClasses = objc_getClassList( CATCH_NULL, 0 );
-
-        Class* classes = (CATCH_UNSAFE_UNRETAINED Class *)malloc( sizeof(Class) * noClasses);
-        objc_getClassList( classes, noClasses );
-
-        for( int c = 0; c < noClasses; c++ ) {
-            Class cls = classes[c];
-            {
-                u_int count;
-                Method* methods = class_copyMethodList( cls, &count );
-                for( u_int m = 0; m < count ; m++ ) {
-                    SEL selector = method_getName(methods[m]);
-                    std::string methodName = sel_getName(selector);
-                    if( startsWith( methodName, "Catch_TestCase_" ) ) {
-                        std::string testCaseName = methodName.substr( 15 );
-                        std::string name = Detail::getAnnotation( cls, "Name", testCaseName );
-                        std::string desc = Detail::getAnnotation( cls, "Description", testCaseName );
-                        const char* className = class_getName( cls );
-
-                        getMutableRegistryHub().registerTest( makeTestCase( new OcMethod( cls, selector ), className, name.c_str(), desc.c_str(), SourceLineInfo() ) );
-                        noTestMethods++;
-                    }
-                }
-                free(methods);
-            }
-        }
-        return noTestMethods;
-    }
-
-    namespace Matchers {
-        namespace Impl {
-        namespace NSStringMatchers {
-
-            template<typename MatcherT>
-            struct StringHolder : MatcherImpl<MatcherT, NSString*>{
-                StringHolder( NSString* substr ) : m_substr( [substr copy] ){}
-                StringHolder( StringHolder const& other ) : m_substr( [other.m_substr copy] ){}
-                StringHolder() {
-                    arcSafeRelease( m_substr );
-                }
-
-                NSString* m_substr;
-            };
-
-            struct Equals : StringHolder<Equals> {
-                Equals( NSString* substr ) : StringHolder( substr ){}
-
-                virtual bool match( ExpressionType const& str ) const {
-                    return  (str != nil || m_substr == nil ) &&
-                            [str isEqualToString:m_substr];
-                }
-
-                virtual std::string toString() const {
-                    return "equals string: " + Catch::toString( m_substr );
-                }
-            };
-
-            struct Contains : StringHolder<Contains> {
-                Contains( NSString* substr ) : StringHolder( substr ){}
-
-                virtual bool match( ExpressionType const& str ) const {
-                    return  (str != nil || m_substr == nil ) &&
-                            [str rangeOfString:m_substr].location != NSNotFound;
-                }
-
-                virtual std::string toString() const {
-                    return "contains string: " + Catch::toString( m_substr );
-                }
-            };
-
-            struct StartsWith : StringHolder<StartsWith> {
-                StartsWith( NSString* substr ) : StringHolder( substr ){}
-
-                virtual bool match( ExpressionType const& str ) const {
-                    return  (str != nil || m_substr == nil ) &&
-                            [str rangeOfString:m_substr].location == 0;
-                }
-
-                virtual std::string toString() const {
-                    return "starts with: " + Catch::toString( m_substr );
-                }
-            };
-            struct EndsWith : StringHolder<EndsWith> {
-                EndsWith( NSString* substr ) : StringHolder( substr ){}
-
-                virtual bool match( ExpressionType const& str ) const {
-                    return  (str != nil || m_substr == nil ) &&
-                            [str rangeOfString:m_substr].location == [str length] - [m_substr length];
-                }
-
-                virtual std::string toString() const {
-                    return "ends with: " + Catch::toString( m_substr );
-                }
-            };
-
-        } // namespace NSStringMatchers
-        } // namespace Impl
-
-        inline Impl::NSStringMatchers::Equals
-            Equals( NSString* substr ){ return Impl::NSStringMatchers::Equals( substr ); }
-
-        inline Impl::NSStringMatchers::Contains
-            Contains( NSString* substr ){ return Impl::NSStringMatchers::Contains( substr ); }
-
-        inline Impl::NSStringMatchers::StartsWith
-            StartsWith( NSString* substr ){ return Impl::NSStringMatchers::StartsWith( substr ); }
-
-        inline Impl::NSStringMatchers::EndsWith
-            EndsWith( NSString* substr ){ return Impl::NSStringMatchers::EndsWith( substr ); }
-
-    } // namespace Matchers
-
-    using namespace Matchers;
-
-} // namespace Catch
-
-///////////////////////////////////////////////////////////////////////////////
-#define OC_TEST_CASE( name, desc )\
-+(NSString*) INTERNAL_CATCH_UNIQUE_NAME( Catch_Name_test ) \
-{\
-return @ name; \
-}\
-+(NSString*) INTERNAL_CATCH_UNIQUE_NAME( Catch_Description_test ) \
-{ \
-return @ desc; \
-} \
--(void) INTERNAL_CATCH_UNIQUE_NAME( Catch_TestCase_test )
-
-#endif
-
-#ifdef CATCH_IMPL
-// #included from: internal/catch_impl.hpp
-#define TWOBLUECUBES_CATCH_IMPL_HPP_INCLUDED
-
-// Collect all the implementation files together here
-// These are the equivalent of what would usually be cpp files
-
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wweak-vtables"
-#endif
-
-// #included from: ../catch_session.hpp
-#define TWOBLUECUBES_CATCH_RUNNER_HPP_INCLUDED
-
-// #included from: internal/catch_commandline.hpp
-#define TWOBLUECUBES_CATCH_COMMANDLINE_HPP_INCLUDED
-
-// #included from: catch_config.hpp
-#define TWOBLUECUBES_CATCH_CONFIG_HPP_INCLUDED
-
-// #included from: catch_test_spec_parser.hpp
-#define TWOBLUECUBES_CATCH_TEST_SPEC_PARSER_HPP_INCLUDED
-
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wpadded"
-#endif
-
-// #included from: catch_test_spec.hpp
-#define TWOBLUECUBES_CATCH_TEST_SPEC_HPP_INCLUDED
-
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wpadded"
-#endif
-
-// #included from: catch_wildcard_pattern.hpp
-#define TWOBLUECUBES_CATCH_WILDCARD_PATTERN_HPP_INCLUDED
-
-namespace Catch
-{
-    class WildcardPattern {
-        enum WildcardPosition {
-            NoWildcard = 0,
-            WildcardAtStart = 1,
-            WildcardAtEnd = 2,
-            WildcardAtBothEnds = WildcardAtStart | WildcardAtEnd
-        };
-
-    public:
-
-        WildcardPattern( std::string const& pattern, CaseSensitive::Choice caseSensitivity )
-        :   m_caseSensitivity( caseSensitivity ),
-            m_wildcard( NoWildcard ),
-            m_pattern( adjustCase( pattern ) )
-        {
-            if( startsWith( m_pattern, "*" ) ) {
-                m_pattern = m_pattern.substr( 1 );
-                m_wildcard = WildcardAtStart;
-            }
-            if( endsWith( m_pattern, "*" ) ) {
-                m_pattern = m_pattern.substr( 0, m_pattern.size()-1 );
-                m_wildcard = static_cast<WildcardPosition>( m_wildcard | WildcardAtEnd );
-            }
-        }
-        virtual ~WildcardPattern();
-        virtual bool matches( std::string const& str ) const {
-            switch( m_wildcard ) {
-                case NoWildcard:
-                    return m_pattern == adjustCase( str );
-                case WildcardAtStart:
-                    return endsWith( adjustCase( str ), m_pattern );
-                case WildcardAtEnd:
-                    return startsWith( adjustCase( str ), m_pattern );
-                case WildcardAtBothEnds:
-                    return contains( adjustCase( str ), m_pattern );
-            }
-
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunreachable-code"
-#endif
-            throw std::logic_error( "Unknown enum" );
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-        }
-    private:
-        std::string adjustCase( std::string const& str ) const {
-            return m_caseSensitivity == CaseSensitive::No ? toLower( str ) : str;
-        }
-        CaseSensitive::Choice m_caseSensitivity;
-        WildcardPosition m_wildcard;
-        std::string m_pattern;
-    };
-}
-
-#include <string>
-#include <vector>
-
-namespace Catch {
-
-    class TestSpec {
-        struct Pattern : SharedImpl<> {
-            virtual ~Pattern();
-            virtual bool matches( TestCaseInfo const& testCase ) const = 0;
-        };
-        class NamePattern : public Pattern {
-        public:
-            NamePattern( std::string const& name )
-            : m_wildcardPattern( toLower( name ), CaseSensitive::No )
-            {}
-            virtual ~NamePattern();
-            virtual bool matches( TestCaseInfo const& testCase ) const {
-                return m_wildcardPattern.matches( toLower( testCase.name ) );
-            }
-        private:
-            WildcardPattern m_wildcardPattern;
-        };
-
-        class TagPattern : public Pattern {
-        public:
-            TagPattern( std::string const& tag ) : m_tag( toLower( tag ) ) {}
-            virtual ~TagPattern();
-            virtual bool matches( TestCaseInfo const& testCase ) const {
-                return testCase.lcaseTags.find( m_tag ) != testCase.lcaseTags.end();
-            }
-        private:
-            std::string m_tag;
-        };
-
-        class ExcludedPattern : public Pattern {
-        public:
-            ExcludedPattern( Ptr<Pattern> const& underlyingPattern ) : m_underlyingPattern( underlyingPattern ) {}
-            virtual ~ExcludedPattern();
-            virtual bool matches( TestCaseInfo const& testCase ) const { return !m_underlyingPattern->matches( testCase ); }
-        private:
-            Ptr<Pattern> m_underlyingPattern;
-        };
-
-        struct Filter {
-            std::vector<Ptr<Pattern> > m_patterns;
-
-            bool matches( TestCaseInfo const& testCase ) const {
-                // All patterns in a filter must match for the filter to be a match
-                for( std::vector<Ptr<Pattern> >::const_iterator it = m_patterns.begin(), itEnd = m_patterns.end(); it != itEnd; ++it )
-                    if( !(*it)->matches( testCase ) )
-                        return false;
-                    return true;
-            }
-        };
-
-    public:
-        bool hasFilters() const {
-            return !m_filters.empty();
-        }
-        bool matches( TestCaseInfo const& testCase ) const {
-            // A TestSpec matches if any filter matches
-            for( std::vector<Filter>::const_iterator it = m_filters.begin(), itEnd = m_filters.end(); it != itEnd; ++it )
-                if( it->matches( testCase ) )
-                    return true;
-            return false;
-        }
-
-    private:
-        std::vector<Filter> m_filters;
-
-        friend class TestSpecParser;
-    };
-}
-
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
-namespace Catch {
-
-    class TestSpecParser {
-        enum Mode{ None, Name, QuotedName, Tag };
-        Mode m_mode;
-        bool m_exclusion;
-        std::size_t m_start, m_pos;
-        std::string m_arg;
-        TestSpec::Filter m_currentFilter;
-        TestSpec m_testSpec;
-        ITagAliasRegistry const* m_tagAliases;
-
-    public:
-        TestSpecParser( ITagAliasRegistry const& tagAliases ) : m_tagAliases( &tagAliases ) {}
-
-        TestSpecParser& parse( std::string const& arg ) {
-            m_mode = None;
-            m_exclusion = false;
-            m_start = std::string::npos;
-            m_arg = m_tagAliases->expandAliases( arg );
-            for( m_pos = 0; m_pos < m_arg.size(); ++m_pos )
-                visitChar( m_arg[m_pos] );
-            if( m_mode == Name )
-                addPattern<TestSpec::NamePattern>();
-            return *this;
-        }
-        TestSpec testSpec() {
-            addFilter();
-            return m_testSpec;
-        }
-    private:
-        void visitChar( char c ) {
-            if( m_mode == None ) {
-                switch( c ) {
-                case ' ': return;
-                case '~': m_exclusion = true; return;
-                case '[': return startNewMode( Tag, ++m_pos );
-                case '"': return startNewMode( QuotedName, ++m_pos );
-                default: startNewMode( Name, m_pos ); break;
-                }
-            }
-            if( m_mode == Name ) {
-                if( c == ',' ) {
-                    addPattern<TestSpec::NamePattern>();
-                    addFilter();
-                }
-                else if( c == '[' ) {
-                    if( subString() == "exclude:" )
-                        m_exclusion = true;
-                    else
-                        addPattern<TestSpec::NamePattern>();
-                    startNewMode( Tag, ++m_pos );
-                }
-            }
-            else if( m_mode == QuotedName && c == '"' )
-                addPattern<TestSpec::NamePattern>();
-            else if( m_mode == Tag && c == ']' )
-                addPattern<TestSpec::TagPattern>();
-        }
-        void startNewMode( Mode mode, std::size_t start ) {
-            m_mode = mode;
-            m_start = start;
-        }
-        std::string subString() const { return m_arg.substr( m_start, m_pos - m_start ); }
-        template<typename T>
-        void addPattern() {
-            std::string token = subString();
-            if( startsWith( token, "exclude:" ) ) {
-                m_exclusion = true;
-                token = token.substr( 8 );
-            }
-            if( !token.empty() ) {
-                Ptr<TestSpec::Pattern> pattern = new T( token );
-                if( m_exclusion )
-                    pattern = new TestSpec::ExcludedPattern( pattern );
-                m_currentFilter.m_patterns.push_back( pattern );
-            }
-            m_exclusion = false;
-            m_mode = None;
-        }
-        void addFilter() {
-            if( !m_currentFilter.m_patterns.empty() ) {
-                m_testSpec.m_filters.push_back( m_currentFilter );
-                m_currentFilter = TestSpec::Filter();
-            }
-        }
-    };
-    inline TestSpec parseTestSpec( std::string const& arg ) {
-        return TestSpecParser( ITagAliasRegistry::get() ).parse( arg ).testSpec();
-    }
-
-} // namespace Catch
-
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
-// #included from: catch_interfaces_config.h
-#define TWOBLUECUBES_CATCH_INTERFACES_CONFIG_H_INCLUDED
-
-#include <iostream>
-#include <string>
-#include <vector>
-
-namespace Catch {
-
-    struct Verbosity { enum Level {
-        NoOutput = 0,
-        Quiet,
-        Normal
-    }; };
-
-    struct WarnAbout { enum What {
-        Nothing = 0x00,
-        NoAssertions = 0x01
-    }; };
-
-    struct ShowDurations { enum OrNot {
-        DefaultForReporter,
-        Always,
-        Never
-    }; };
-    struct RunTests { enum InWhatOrder {
-        InDeclarationOrder,
-        InLexicographicalOrder,
-        InRandomOrder
-    }; };
-    struct UseColour { enum YesOrNo {
-        Auto,
-        Yes,
-        No
-    }; };
-
-    class TestSpec;
-
-    struct IConfig : IShared {
-
-        virtual ~IConfig();
-
-        virtual bool allowThrows() const = 0;
-        virtual std::ostream& stream() const = 0;
-        virtual std::string name() const = 0;
-        virtual bool includeSuccessfulResults() const = 0;
-        virtual bool shouldDebugBreak() const = 0;
-        virtual bool warnAboutMissingAssertions() const = 0;
-        virtual int abortAfter() const = 0;
-        virtual bool showInvisibles() const = 0;
-        virtual ShowDurations::OrNot showDurations() const = 0;
-        virtual TestSpec const& testSpec() const = 0;
-        virtual RunTests::InWhatOrder runOrder() const = 0;
-        virtual unsigned int rngSeed() const = 0;
-        virtual UseColour::YesOrNo useColour() const = 0;
-    };
-}
-
-// #included from: catch_stream.h
-#define TWOBLUECUBES_CATCH_STREAM_H_INCLUDED
-
-// #included from: catch_streambuf.h
-#define TWOBLUECUBES_CATCH_STREAMBUF_H_INCLUDED
-
-#include <streambuf>
-
-namespace Catch {
-
-    class StreamBufBase : public std::streambuf {
-    public:
-        virtual ~StreamBufBase() CATCH_NOEXCEPT;
-    };
-}
-
-#include <streambuf>
-#include <ostream>
-#include <fstream>
-
-namespace Catch {
-
-    std::ostream& cout();
-    std::ostream& cerr();
-
-    struct IStream {
-        virtual ~IStream() CATCH_NOEXCEPT;
-        virtual std::ostream& stream() const = 0;
-    };
-
-    class FileStream : public IStream {
-        mutable std::ofstream m_ofs;
-    public:
-        FileStream( std::string const& filename );
-        virtual ~FileStream() CATCH_NOEXCEPT;
-    public: // IStream
-        virtual std::ostream& stream() const CATCH_OVERRIDE;
-    };
-
-    class CoutStream : public IStream {
-        mutable std::ostream m_os;
-    public:
-        CoutStream();
-        virtual ~CoutStream() CATCH_NOEXCEPT;
-
-    public: // IStream
-        virtual std::ostream& stream() const CATCH_OVERRIDE;
-    };
-
-    class DebugOutStream : public IStream {
-        std::auto_ptr<StreamBufBase> m_streamBuf;
-        mutable std::ostream m_os;
-    public:
-        DebugOutStream();
-        virtual ~DebugOutStream() CATCH_NOEXCEPT;
-
-    public: // IStream
-        virtual std::ostream& stream() const CATCH_OVERRIDE;
-    };
-}
-
-#include <memory>
-#include <vector>
-#include <string>
-#include <iostream>
-#include <ctime>
-
-#ifndef CATCH_CONFIG_CONSOLE_WIDTH
-#define CATCH_CONFIG_CONSOLE_WIDTH 80
-#endif
-
-namespace Catch {
-
-    struct ConfigData {
-
-        ConfigData()
-        :   listTests( false ),
-            listTags( false ),
-            listReporters( false ),
-            listTestNamesOnly( false ),
-            showSuccessfulTests( false ),
-            shouldDebugBreak( false ),
-            noThrow( false ),
-            showHelp( false ),
-            showInvisibles( false ),
-            filenamesAsTags( false ),
-            abortAfter( -1 ),
-            rngSeed( 0 ),
-            verbosity( Verbosity::Normal ),
-            warnings( WarnAbout::Nothing ),
-            showDurations( ShowDurations::DefaultForReporter ),
-            runOrder( RunTests::InDeclarationOrder ),
-            useColour( UseColour::Auto )
-        {}
-
-        bool listTests;
-        bool listTags;
-        bool listReporters;
-        bool listTestNamesOnly;
-
-        bool showSuccessfulTests;
-        bool shouldDebugBreak;
-        bool noThrow;
-        bool showHelp;
-        bool showInvisibles;
-        bool filenamesAsTags;
-
-        int abortAfter;
-        unsigned int rngSeed;
-
-        Verbosity::Level verbosity;
-        WarnAbout::What warnings;
-        ShowDurations::OrNot showDurations;
-        RunTests::InWhatOrder runOrder;
-        UseColour::YesOrNo useColour;
-
-        std::string outputFilename;
-        std::string name;
-        std::string processName;
-
-        std::vector<std::string> reporterNames;
-        std::vector<std::string> testsOrTags;
-    };
-
-    class Config : public SharedImpl<IConfig> {
-    private:
-        Config( Config const& other );
-        Config& operator = ( Config const& other );
-        virtual void dummy();
-    public:
-
-        Config()
-        {}
-
-        Config( ConfigData const& data )
-        :   m_data( data ),
-            m_stream( openStream() )
-        {
-            if( !data.testsOrTags.empty() ) {
-                TestSpecParser parser( ITagAliasRegistry::get() );
-                for( std::size_t i = 0; i < data.testsOrTags.size(); ++i )
-                    parser.parse( data.testsOrTags[i] );
-                m_testSpec = parser.testSpec();
-            }
-        }
-
-        virtual ~Config() {
-        }
-
-        std::string const& getFilename() const {
-            return m_data.outputFilename ;
-        }
-
-        bool listTests() const { return m_data.listTests; }
-        bool listTestNamesOnly() const { return m_data.listTestNamesOnly; }
-        bool listTags() const { return m_data.listTags; }
-        bool listReporters() const { return m_data.listReporters; }
-
-        std::string getProcessName() const { return m_data.processName; }
-
-        bool shouldDebugBreak() const { return m_data.shouldDebugBreak; }
-
-        std::vector<std::string> getReporterNames() const { return m_data.reporterNames; }
-
-        int abortAfter() const { return m_data.abortAfter; }
-
-        TestSpec const& testSpec() const { return m_testSpec; }
-
-        bool showHelp() const { return m_data.showHelp; }
-        bool showInvisibles() const { return m_data.showInvisibles; }
-
-        // IConfig interface
-        virtual bool allowThrows() const        { return !m_data.noThrow; }
-        virtual std::ostream& stream() const    { return m_stream->stream(); }
-        virtual std::string name() const        { return m_data.name.empty() ? m_data.processName : m_data.name; }
-        virtual bool includeSuccessfulResults() const   { return m_data.showSuccessfulTests; }
-        virtual bool warnAboutMissingAssertions() const { return m_data.warnings & WarnAbout::NoAssertions; }
-        virtual ShowDurations::OrNot showDurations() const { return m_data.showDurations; }
-        virtual RunTests::InWhatOrder runOrder() const  { return m_data.runOrder; }
-        virtual unsigned int rngSeed() const    { return m_data.rngSeed; }
-        virtual UseColour::YesOrNo useColour() const { return m_data.useColour; }
-
-    private:
-
-        IStream const* openStream() {
-            if( m_data.outputFilename.empty() )
-                return new CoutStream();
-            else if( m_data.outputFilename[0] == '%' ) {
-                if( m_data.outputFilename == "%debug" )
-                    return new DebugOutStream();
-                else
-                    throw std::domain_error( "Unrecognised stream: " + m_data.outputFilename );
-            }
-            else
-                return new FileStream( m_data.outputFilename );
-        }
-        ConfigData m_data;
-
-        std::auto_ptr<IStream const> m_stream;
-        TestSpec m_testSpec;
-    };
-
-} // end namespace Catch
-
-// #included from: catch_clara.h
-#define TWOBLUECUBES_CATCH_CLARA_H_INCLUDED
-
-// Use Catch's value for console width (store Clara's off to the side, if present)
-#ifdef CLARA_CONFIG_CONSOLE_WIDTH
-#define CATCH_TEMP_CLARA_CONFIG_CONSOLE_WIDTH CLARA_CONFIG_CONSOLE_WIDTH
-#undef CLARA_CONFIG_CONSOLE_WIDTH
-#endif
-#define CLARA_CONFIG_CONSOLE_WIDTH CATCH_CONFIG_CONSOLE_WIDTH
-
-// Declare Clara inside the Catch namespace
-#define STITCH_CLARA_OPEN_NAMESPACE namespace Catch {
-// #included from: ../external/clara.h
-
-// Version 0.0.2.3
-
-// Only use header guard if we are not using an outer namespace
-#if !defined(TWOBLUECUBES_CLARA_H_INCLUDED) || defined(STITCH_CLARA_OPEN_NAMESPACE)
-
-#ifndef STITCH_CLARA_OPEN_NAMESPACE
-#define TWOBLUECUBES_CLARA_H_INCLUDED
-#define STITCH_CLARA_OPEN_NAMESPACE
-#define STITCH_CLARA_CLOSE_NAMESPACE
-#else
-#define STITCH_CLARA_CLOSE_NAMESPACE }
-#endif
-
-#define STITCH_TBC_TEXT_FORMAT_OPEN_NAMESPACE STITCH_CLARA_OPEN_NAMESPACE
-
-// ----------- #included from tbc_text_format.h -----------
-
-// Only use header guard if we are not using an outer namespace
-#if !defined(TBC_TEXT_FORMAT_H_INCLUDED) || defined(STITCH_TBC_TEXT_FORMAT_OUTER_NAMESPACE)
-#ifndef STITCH_TBC_TEXT_FORMAT_OUTER_NAMESPACE
-#define TBC_TEXT_FORMAT_H_INCLUDED
-#endif
-
-#include <string>
-#include <vector>
-#include <sstream>
-#include <algorithm>
-
-// Use optional outer namespace
-#ifdef STITCH_TBC_TEXT_FORMAT_OUTER_NAMESPACE
-namespace STITCH_TBC_TEXT_FORMAT_OUTER_NAMESPACE {
-#endif
-
-namespace Tbc {
-
-#ifdef TBC_TEXT_FORMAT_CONSOLE_WIDTH
-    const unsigned int consoleWidth = TBC_TEXT_FORMAT_CONSOLE_WIDTH;
-#else
-    const unsigned int consoleWidth = 80;
-#endif
-
-    struct TextAttributes {
-        TextAttributes()
-        :   initialIndent( std::string::npos ),
-            indent( 0 ),
-            width( consoleWidth-1 ),
-            tabChar( '\t' )
-        {}
-
-        TextAttributes& setInitialIndent( std::size_t _value )  { initialIndent = _value; return *this; }
-        TextAttributes& setIndent( std::size_t _value )         { indent = _value; return *this; }
-        TextAttributes& setWidth( std::size_t _value )          { width = _value; return *this; }
-        TextAttributes& setTabChar( char _value )               { tabChar = _value; return *this; }
-
-        std::size_t initialIndent;  // indent of first line, or npos
-        std::size_t indent;         // indent of subsequent lines, or all if initialIndent is npos
-        std::size_t width;          // maximum width of text, including indent. Longer text will wrap
-        char tabChar;               // If this char is seen the indent is changed to current pos
-    };
-
-    class Text {
-    public:
-        Text( std::string const& _str, TextAttributes const& _attr = TextAttributes() )
-        : attr( _attr )
-        {
-            std::string wrappableChars = " [({.,/|\\-";
-            std::size_t indent = _attr.initialIndent != std::string::npos
-                ? _attr.initialIndent
-                : _attr.indent;
-            std::string remainder = _str;
-
-            while( !remainder.empty() ) {
-                if( lines.size() >= 1000 ) {
-                    lines.push_back( "... message truncated due to excessive size" );
-                    return;
-                }
-                std::size_t tabPos = std::string::npos;
-                std::size_t width = (std::min)( remainder.size(), _attr.width - indent );
-                std::size_t pos = remainder.find_first_of( '\n' );
-                if( pos <= width ) {
-                    width = pos;
-                }
-                pos = remainder.find_last_of( _attr.tabChar, width );
-                if( pos != std::string::npos ) {
-                    tabPos = pos;
-                    if( remainder[width] == '\n' )
-                        width--;
-                    remainder = remainder.substr( 0, tabPos ) + remainder.substr( tabPos+1 );
-                }
-
-                if( width == remainder.size() ) {
-                    spliceLine( indent, remainder, width );
-                }
-                else if( remainder[width] == '\n' ) {
-                    spliceLine( indent, remainder, width );
-                    if( width <= 1 || remainder.size() != 1 )
-                        remainder = remainder.substr( 1 );
-                    indent = _attr.indent;
-                }
-                else {
-                    pos = remainder.find_last_of( wrappableChars, width );
-                    if( pos != std::string::npos && pos > 0 ) {
-                        spliceLine( indent, remainder, pos );
-                        if( remainder[0] == ' ' )
-                            remainder = remainder.substr( 1 );
-                    }
-                    else {
-                        spliceLine( indent, remainder, width-1 );
-                        lines.back() += "-";
-                    }
-                    if( lines.size() == 1 )
-                        indent = _attr.indent;
-                    if( tabPos != std::string::npos )
-                        indent += tabPos;
-                }
-            }
-        }
-
-        void spliceLine( std::size_t _indent, std::string& _remainder, std::size_t _pos ) {
-            lines.push_back( std::string( _indent, ' ' ) + _remainder.substr( 0, _pos ) );
-            _remainder = _remainder.substr( _pos );
-        }
-
-        typedef std::vector<std::string>::const_iterator const_iterator;
-
-        const_iterator begin() const { return lines.begin(); }
-        const_iterator end() const { return lines.end(); }
-        std::string const& last() const { return lines.back(); }
-        std::size_t size() const { return lines.size(); }
-        std::string const& operator[]( std::size_t _index ) const { return lines[_index]; }
-        std::string toString() const {
-            std::ostringstream oss;
-            oss << *this;
-            return oss.str();
-        }
-
-        inline friend std::ostream& operator << ( std::ostream& _stream, Text const& _text ) {
-            for( Text::const_iterator it = _text.begin(), itEnd = _text.end();
-                it != itEnd; ++it ) {
-                if( it != _text.begin() )
-                    _stream << "\n";
-                _stream << *it;
-            }
-            return _stream;
-        }
-
-    private:
-        std::string str;
-        TextAttributes attr;
-        std::vector<std::string> lines;
-    };
-
-} // end namespace Tbc
-
-#ifdef STITCH_TBC_TEXT_FORMAT_OUTER_NAMESPACE
-} // end outer namespace
-#endif
-
-#endif // TBC_TEXT_FORMAT_H_INCLUDED
-
-// ----------- end of #include from tbc_text_format.h -----------
-// ........... back in clara.h
-
-#undef STITCH_TBC_TEXT_FORMAT_OPEN_NAMESPACE
-
-// ----------- #included from clara_compilers.h -----------
-
-#ifndef TWOBLUECUBES_CLARA_COMPILERS_H_INCLUDED
-#define TWOBLUECUBES_CLARA_COMPILERS_H_INCLUDED
-
-// Detect a number of compiler features - mostly C++11/14 conformance - by compiler
-// The following features are defined:
-//
-// CLARA_CONFIG_CPP11_NULLPTR : is nullptr supported?
-// CLARA_CONFIG_CPP11_NOEXCEPT : is noexcept supported?
-// CLARA_CONFIG_CPP11_GENERATED_METHODS : The delete and default keywords for compiler generated methods
-// CLARA_CONFIG_CPP11_OVERRIDE : is override supported?
-// CLARA_CONFIG_CPP11_UNIQUE_PTR : is unique_ptr supported (otherwise use auto_ptr)
-
-// CLARA_CONFIG_CPP11_OR_GREATER : Is C++11 supported?
-
-// CLARA_CONFIG_VARIADIC_MACROS : are variadic macros supported?
-
-// In general each macro has a _NO_<feature name> form
-// (e.g. CLARA_CONFIG_CPP11_NO_NULLPTR) which disables the feature.
-// Many features, at point of detection, define an _INTERNAL_ macro, so they
-// can be combined, en-mass, with the _NO_ forms later.
-
-// All the C++11 features can be disabled with CLARA_CONFIG_NO_CPP11
-
-#ifdef __clang__
-
-#if __has_feature(cxx_nullptr)
-#define CLARA_INTERNAL_CONFIG_CPP11_NULLPTR
-#endif
-
-#if __has_feature(cxx_noexcept)
-#define CLARA_INTERNAL_CONFIG_CPP11_NOEXCEPT
-#endif
-
-#endif // __clang__
-
-////////////////////////////////////////////////////////////////////////////////
-// GCC
-#ifdef __GNUC__
-
-#if __GNUC__ == 4 && __GNUC_MINOR__ >= 6 && defined(__GXX_EXPERIMENTAL_CXX0X__)
-#define CLARA_INTERNAL_CONFIG_CPP11_NULLPTR
-#endif
-
-// - otherwise more recent versions define __cplusplus >= 201103L
-// and will get picked up below
-
-#endif // __GNUC__
-
-////////////////////////////////////////////////////////////////////////////////
-// Visual C++
-#ifdef _MSC_VER
-
-#if (_MSC_VER >= 1600)
-#define CLARA_INTERNAL_CONFIG_CPP11_NULLPTR
-#define CLARA_INTERNAL_CONFIG_CPP11_UNIQUE_PTR
-#endif
-
-#if (_MSC_VER >= 1900 ) // (VC++ 13 (VS2015))
-#define CLARA_INTERNAL_CONFIG_CPP11_NOEXCEPT
-#define CLARA_INTERNAL_CONFIG_CPP11_GENERATED_METHODS
-#endif
-
-#endif // _MSC_VER
-
-////////////////////////////////////////////////////////////////////////////////
-// C++ language feature support
-
-// catch all support for C++11
-#if defined(__cplusplus) && __cplusplus >= 201103L
-
-#define CLARA_CPP11_OR_GREATER
-
-#if !defined(CLARA_INTERNAL_CONFIG_CPP11_NULLPTR)
-#define CLARA_INTERNAL_CONFIG_CPP11_NULLPTR
-#endif
-
-#ifndef CLARA_INTERNAL_CONFIG_CPP11_NOEXCEPT
-#define CLARA_INTERNAL_CONFIG_CPP11_NOEXCEPT
-#endif
-
-#ifndef CLARA_INTERNAL_CONFIG_CPP11_GENERATED_METHODS
-#define CLARA_INTERNAL_CONFIG_CPP11_GENERATED_METHODS
-#endif
-
-#if !defined(CLARA_INTERNAL_CONFIG_CPP11_OVERRIDE)
-#define CLARA_INTERNAL_CONFIG_CPP11_OVERRIDE
-#endif
-#if !defined(CLARA_INTERNAL_CONFIG_CPP11_UNIQUE_PTR)
-#define CLARA_INTERNAL_CONFIG_CPP11_UNIQUE_PTR
-#endif
-
-#endif // __cplusplus >= 201103L
-
-// Now set the actual defines based on the above + anything the user has configured
-#if defined(CLARA_INTERNAL_CONFIG_CPP11_NULLPTR) && !defined(CLARA_CONFIG_CPP11_NO_NULLPTR) && !defined(CLARA_CONFIG_CPP11_NULLPTR) && !defined(CLARA_CONFIG_NO_CPP11)
-#define CLARA_CONFIG_CPP11_NULLPTR
-#endif
-#if defined(CLARA_INTERNAL_CONFIG_CPP11_NOEXCEPT) && !defined(CLARA_CONFIG_CPP11_NO_NOEXCEPT) && !defined(CLARA_CONFIG_CPP11_NOEXCEPT) && !defined(CLARA_CONFIG_NO_CPP11)
-#define CLARA_CONFIG_CPP11_NOEXCEPT
-#endif
-#if defined(CLARA_INTERNAL_CONFIG_CPP11_GENERATED_METHODS) && !defined(CLARA_CONFIG_CPP11_NO_GENERATED_METHODS) && !defined(CLARA_CONFIG_CPP11_GENERATED_METHODS) && !defined(CLARA_CONFIG_NO_CPP11)
-#define CLARA_CONFIG_CPP11_GENERATED_METHODS
-#endif
-#if defined(CLARA_INTERNAL_CONFIG_CPP11_OVERRIDE) && !defined(CLARA_CONFIG_NO_OVERRIDE) && !defined(CLARA_CONFIG_CPP11_OVERRIDE) && !defined(CLARA_CONFIG_NO_CPP11)
-#define CLARA_CONFIG_CPP11_OVERRIDE
-#endif
-#if defined(CLARA_INTERNAL_CONFIG_CPP11_UNIQUE_PTR) && !defined(CLARA_CONFIG_NO_UNIQUE_PTR) && !defined(CLARA_CONFIG_CPP11_UNIQUE_PTR) && !defined(CLARA_CONFIG_NO_CPP11)
-#define CLARA_CONFIG_CPP11_UNIQUE_PTR
-#endif
-
-// noexcept support:
-#if defined(CLARA_CONFIG_CPP11_NOEXCEPT) && !defined(CLARA_NOEXCEPT)
-#define CLARA_NOEXCEPT noexcept
-#  define CLARA_NOEXCEPT_IS(x) noexcept(x)
-#else
-#define CLARA_NOEXCEPT throw()
-#  define CLARA_NOEXCEPT_IS(x)
-#endif
-
-// nullptr support
-#ifdef CLARA_CONFIG_CPP11_NULLPTR
-#define CLARA_NULL nullptr
-#else
-#define CLARA_NULL NULL
-#endif
-
-// override support
-#ifdef CLARA_CONFIG_CPP11_OVERRIDE
-#define CLARA_OVERRIDE override
-#else
-#define CLARA_OVERRIDE
-#endif
-
-// unique_ptr support
-#ifdef CLARA_CONFIG_CPP11_UNIQUE_PTR
-#   define CLARA_AUTO_PTR( T ) std::unique_ptr<T>
-#else
-#   define CLARA_AUTO_PTR( T ) std::auto_ptr<T>
-#endif
-
-#endif // TWOBLUECUBES_CLARA_COMPILERS_H_INCLUDED
-
-// ----------- end of #include from clara_compilers.h -----------
-// ........... back in clara.h
-
-#include <map>
-#include <stdexcept>
-#include <memory>
-
-#if defined(WIN32) || defined(__WIN32__) || defined(_WIN32) || defined(_MSC_VER)
-#define CLARA_PLATFORM_WINDOWS
-#endif
-
-// Use optional outer namespace
-#ifdef STITCH_CLARA_OPEN_NAMESPACE
-STITCH_CLARA_OPEN_NAMESPACE
-#endif
-
-namespace Clara {
-
-    struct UnpositionalTag {};
-
-    extern UnpositionalTag _;
-
-#ifdef CLARA_CONFIG_MAIN
-    UnpositionalTag _;
-#endif
-
-    namespace Detail {
-
-#ifdef CLARA_CONSOLE_WIDTH
-    const unsigned int consoleWidth = CLARA_CONFIG_CONSOLE_WIDTH;
-#else
-    const unsigned int consoleWidth = 80;
-#endif
-
-        using namespace Tbc;
-
-        inline bool startsWith( std::string const& str, std::string const& prefix ) {
-            return str.size() >= prefix.size() && str.substr( 0, prefix.size() ) == prefix;
-        }
-
-        template<typename T> struct RemoveConstRef{ typedef T type; };
-        template<typename T> struct RemoveConstRef<T&>{ typedef T type; };
-        template<typename T> struct RemoveConstRef<T const&>{ typedef T type; };
-        template<typename T> struct RemoveConstRef<T const>{ typedef T type; };
-
-        template<typename T>    struct IsBool       { static const bool value = false; };
-        template<>              struct IsBool<bool> { static const bool value = true; };
-
-        template<typename T>
-        void convertInto( std::string const& _source, T& _dest ) {
-            std::stringstream ss;
-            ss << _source;
-            ss >> _dest;
-            if( ss.fail() )
-                throw std::runtime_error( "Unable to convert " + _source + " to destination type" );
-        }
-        inline void convertInto( std::string const& _source, std::string& _dest ) {
-            _dest = _source;
-        }
-        inline void convertInto( std::string const& _source, bool& _dest ) {
-            std::string sourceLC = _source;
-            std::transform( sourceLC.begin(), sourceLC.end(), sourceLC.begin(), ::tolower );
-            if( sourceLC == "y" || sourceLC == "1" || sourceLC == "true" || sourceLC == "yes" || sourceLC == "on" )
-                _dest = true;
-            else if( sourceLC == "n" || sourceLC == "0" || sourceLC == "false" || sourceLC == "no" || sourceLC == "off" )
-                _dest = false;
-            else
-                throw std::runtime_error( "Expected a boolean value but did not recognise:\n  '" + _source + "'" );
-        }
-
-        template<typename ConfigT>
-        struct IArgFunction {
-            virtual ~IArgFunction() {}
-#ifdef CLARA_CONFIG_CPP11_GENERATED_METHODS
-            IArgFunction()                      = default;
-            IArgFunction( IArgFunction const& ) = default;
-#endif
-            virtual void set( ConfigT& config, std::string const& value ) const = 0;
-            virtual bool takesArg() const = 0;
-            virtual IArgFunction* clone() const = 0;
-        };
-
-        template<typename ConfigT>
-        class BoundArgFunction {
-        public:
-            BoundArgFunction() : functionObj( CLARA_NULL ) {}
-            BoundArgFunction( IArgFunction<ConfigT>* _functionObj ) : functionObj( _functionObj ) {}
-            BoundArgFunction( BoundArgFunction const& other ) : functionObj( other.functionObj ? other.functionObj->clone() : CLARA_NULL ) {}
-            BoundArgFunction& operator = ( BoundArgFunction const& other ) {
-                IArgFunction<ConfigT>* newFunctionObj = other.functionObj ? other.functionObj->clone() : CLARA_NULL;
-                delete functionObj;
-                functionObj = newFunctionObj;
-                return *this;
-            }
-            ~BoundArgFunction() { delete functionObj; }
-
-            void set( ConfigT& config, std::string const& value ) const {
-                functionObj->set( config, value );
-            }
-            bool takesArg() const { return functionObj->takesArg(); }
-
-            bool isSet() const {
-                return functionObj != CLARA_NULL;
-            }
-        private:
-            IArgFunction<ConfigT>* functionObj;
-        };
-
-        template<typename C>
-        struct NullBinder : IArgFunction<C>{
-            virtual void set( C&, std::string const& ) const {}
-            virtual bool takesArg() const { return true; }
-            virtual IArgFunction<C>* clone() const { return new NullBinder( *this ); }
-        };
-
-        template<typename C, typename M>
-        struct BoundDataMember : IArgFunction<C>{
-            BoundDataMember( M C::* _member ) : member( _member ) {}
-            virtual void set( C& p, std::string const& stringValue ) const {
-                convertInto( stringValue, p.*member );
-            }
-            virtual bool takesArg() const { return !IsBool<M>::value; }
-            virtual IArgFunction<C>* clone() const { return new BoundDataMember( *this ); }
-            M C::* member;
-        };
-        template<typename C, typename M>
-        struct BoundUnaryMethod : IArgFunction<C>{
-            BoundUnaryMethod( void (C::*_member)( M ) ) : member( _member ) {}
-            virtual void set( C& p, std::string const& stringValue ) const {
-                typename RemoveConstRef<M>::type value;
-                convertInto( stringValue, value );
-                (p.*member)( value );
-            }
-            virtual bool takesArg() const { return !IsBool<M>::value; }
-            virtual IArgFunction<C>* clone() const { return new BoundUnaryMethod( *this ); }
-            void (C::*member)( M );
-        };
-        template<typename C>
-        struct BoundNullaryMethod : IArgFunction<C>{
-            BoundNullaryMethod( void (C::*_member)() ) : member( _member ) {}
-            virtual void set( C& p, std::string const& stringValue ) const {
-                bool value;
-                convertInto( stringValue, value );
-                if( value )
-                    (p.*member)();
-            }
-            virtual bool takesArg() const { return false; }
-            virtual IArgFunction<C>* clone() const { return new BoundNullaryMethod( *this ); }
-            void (C::*member)();
-        };
-
-        template<typename C>
-        struct BoundUnaryFunction : IArgFunction<C>{
-            BoundUnaryFunction( void (*_function)( C& ) ) : function( _function ) {}
-            virtual void set( C& obj, std::string const& stringValue ) const {
-                bool value;
-                convertInto( stringValue, value );
-                if( value )
-                    function( obj );
-            }
-            virtual bool takesArg() const { return false; }
-            virtual IArgFunction<C>* clone() const { return new BoundUnaryFunction( *this ); }
-            void (*function)( C& );
-        };
-
-        template<typename C, typename T>
-        struct BoundBinaryFunction : IArgFunction<C>{
-            BoundBinaryFunction( void (*_function)( C&, T ) ) : function( _function ) {}
-            virtual void set( C& obj, std::string const& stringValue ) const {
-                typename RemoveConstRef<T>::type value;
-                convertInto( stringValue, value );
-                function( obj, value );
-            }
-            virtual bool takesArg() const { return !IsBool<T>::value; }
-            virtual IArgFunction<C>* clone() const { return new BoundBinaryFunction( *this ); }
-            void (*function)( C&, T );
-        };
-
-    } // namespace Detail
-
-    inline std::vector<std::string> argsToVector( int argc, char const* const* const argv ) {
-        std::vector<std::string> args( static_cast<std::size_t>( argc ) );
-        for( std::size_t i = 0; i < static_cast<std::size_t>( argc ); ++i )
-            args[i] = argv[i];
-
-        return args;
-    }
-
-    class Parser {
-        enum Mode { None, MaybeShortOpt, SlashOpt, ShortOpt, LongOpt, Positional };
-        Mode mode;
-        std::size_t from;
-        bool inQuotes;
-    public:
-
-        struct Token {
-            enum Type { Positional, ShortOpt, LongOpt };
-            Token( Type _type, std::string const& _data ) : type( _type ), data( _data ) {}
-            Type type;
-            std::string data;
-        };
-
-        Parser() : mode( None ), from( 0 ), inQuotes( false ){}
-
-        void parseIntoTokens( std::vector<std::string> const& args, std::vector<Token>& tokens ) {
-            const std::string doubleDash = "--";
-            for( std::size_t i = 1; i < args.size() && args[i] != doubleDash; ++i )
-                parseIntoTokens( args[i], tokens);
-        }
-
-        void parseIntoTokens( std::string const& arg, std::vector<Token>& tokens ) {
-            for( std::size_t i = 0; i <= arg.size(); ++i ) {
-                char c = arg[i];
-                if( c == '"' )
-                    inQuotes = !inQuotes;
-                mode = handleMode( i, c, arg, tokens );
-            }
-        }
-        Mode handleMode( std::size_t i, char c, std::string const& arg, std::vector<Token>& tokens ) {
-            switch( mode ) {
-                case None: return handleNone( i, c );
-                case MaybeShortOpt: return handleMaybeShortOpt( i, c );
-                case ShortOpt:
-                case LongOpt:
-                case SlashOpt: return handleOpt( i, c, arg, tokens );
-                case Positional: return handlePositional( i, c, arg, tokens );
-                default: throw std::logic_error( "Unknown mode" );
-            }
-        }
-
-        Mode handleNone( std::size_t i, char c ) {
-            if( inQuotes ) {
-                from = i;
-                return Positional;
-            }
-            switch( c ) {
-                case '-': return MaybeShortOpt;
-#ifdef CLARA_PLATFORM_WINDOWS
-                case '/': from = i+1; return SlashOpt;
-#endif
-                default: from = i; return Positional;
-            }
-        }
-        Mode handleMaybeShortOpt( std::size_t i, char c ) {
-            switch( c ) {
-                case '-': from = i+1; return LongOpt;
-                default: from = i; return ShortOpt;
-            }
-        }
-        Mode handleOpt( std::size_t i, char c, std::string const& arg, std::vector<Token>& tokens ) {
-            if( std::string( " \t:=\0", 5 ).find( c ) == std::string::npos )
-                return mode;
-
-            std::string optName = arg.substr( from, i-from );
-            if( mode == ShortOpt )
-                for( std::size_t j = 0; j < optName.size(); ++j )
-                    tokens.push_back( Token( Token::ShortOpt, optName.substr( j, 1 ) ) );
-            else if( mode == SlashOpt && optName.size() == 1 )
-                tokens.push_back( Token( Token::ShortOpt, optName ) );
-            else
-                tokens.push_back( Token( Token::LongOpt, optName ) );
-            return None;
-        }
-        Mode handlePositional( std::size_t i, char c, std::string const& arg, std::vector<Token>& tokens ) {
-            if( inQuotes || std::string( " \t\0", 3 ).find( c ) == std::string::npos )
-                return mode;
-
-            std::string data = arg.substr( from, i-from );
-            tokens.push_back( Token( Token::Positional, data ) );
-            return None;
-        }
-    };
-
-    template<typename ConfigT>
-    struct CommonArgProperties {
-        CommonArgProperties() {}
-        CommonArgProperties( Detail::BoundArgFunction<ConfigT> const& _boundField ) : boundField( _boundField ) {}
-
-        Detail::BoundArgFunction<ConfigT> boundField;
-        std::string description;
-        std::string detail;
-        std::string placeholder; // Only value if boundField takes an arg
-
-        bool takesArg() const {
-            return !placeholder.empty();
-        }
-        void validate() const {
-            if( !boundField.isSet() )
-                throw std::logic_error( "option not bound" );
-        }
-    };
-    struct OptionArgProperties {
-        std::vector<std::string> shortNames;
-        std::string longName;
-
-        bool hasShortName( std::string const& shortName ) const {
-            return std::find( shortNames.begin(), shortNames.end(), shortName ) != shortNames.end();
-        }
-        bool hasLongName( std::string const& _longName ) const {
-            return _longName == longName;
-        }
-    };
-    struct PositionalArgProperties {
-        PositionalArgProperties() : position( -1 ) {}
-        int position; // -1 means non-positional (floating)
-
-        bool isFixedPositional() const {
-            return position != -1;
-        }
-    };
-
-    template<typename ConfigT>
-    class CommandLine {
-
-        struct Arg : CommonArgProperties<ConfigT>, OptionArgProperties, PositionalArgProperties {
-            Arg() {}
-            Arg( Detail::BoundArgFunction<ConfigT> const& _boundField ) : CommonArgProperties<ConfigT>( _boundField ) {}
-
-            using CommonArgProperties<ConfigT>::placeholder; // !TBD
-
-            std::string dbgName() const {
-                if( !longName.empty() )
-                    return "--" + longName;
-                if( !shortNames.empty() )
-                    return "-" + shortNames[0];
-                return "positional args";
-            }
-            std::string commands() const {
-                std::ostringstream oss;
-                bool first = true;
-                std::vector<std::string>::const_iterator it = shortNames.begin(), itEnd = shortNames.end();
-                for(; it != itEnd; ++it ) {
-                    if( first )
-                        first = false;
-                    else
-                        oss << ", ";
-                    oss << "-" << *it;
-                }
-                if( !longName.empty() ) {
-                    if( !first )
-                        oss << ", ";
-                    oss << "--" << longName;
-                }
-                if( !placeholder.empty() )
-                    oss << " <" << placeholder << ">";
-                return oss.str();
-            }
-        };
-
-        typedef CLARA_AUTO_PTR( Arg ) ArgAutoPtr;
-
-        friend void addOptName( Arg& arg, std::string const& optName )
-        {
-            if( optName.empty() )
-                return;
-            if( Detail::startsWith( optName, "--" ) ) {
-                if( !arg.longName.empty() )
-                    throw std::logic_error( "Only one long opt may be specified. '"
-                        + arg.longName
-                        + "' already specified, now attempting to add '"
-                        + optName + "'" );
-                arg.longName = optName.substr( 2 );
-            }
-            else if( Detail::startsWith( optName, "-" ) )
-                arg.shortNames.push_back( optName.substr( 1 ) );
-            else
-                throw std::logic_error( "option must begin with - or --. Option was: '" + optName + "'" );
-        }
-        friend void setPositionalArg( Arg& arg, int position )
-        {
-            arg.position = position;
-        }
-
-        class ArgBuilder {
-        public:
-            ArgBuilder( Arg* arg ) : m_arg( arg ) {}
-
-            // Bind a non-boolean data member (requires placeholder string)
-            template<typename C, typename M>
-            void bind( M C::* field, std::string const& placeholder ) {
-                m_arg->boundField = new Detail::BoundDataMember<C,M>( field );
-                m_arg->placeholder = placeholder;
-            }
-            // Bind a boolean data member (no placeholder required)
-            template<typename C>
-            void bind( bool C::* field ) {
-                m_arg->boundField = new Detail::BoundDataMember<C,bool>( field );
-            }
-
-            // Bind a method taking a single, non-boolean argument (requires a placeholder string)
-            template<typename C, typename M>
-            void bind( void (C::* unaryMethod)( M ), std::string const& placeholder ) {
-                m_arg->boundField = new Detail::BoundUnaryMethod<C,M>( unaryMethod );
-                m_arg->placeholder = placeholder;
-            }
-
-            // Bind a method taking a single, boolean argument (no placeholder string required)
-            template<typename C>
-            void bind( void (C::* unaryMethod)( bool ) ) {
-                m_arg->boundField = new Detail::BoundUnaryMethod<C,bool>( unaryMethod );
-            }
-
-            // Bind a method that takes no arguments (will be called if opt is present)
-            template<typename C>
-            void bind( void (C::* nullaryMethod)() ) {
-                m_arg->boundField = new Detail::BoundNullaryMethod<C>( nullaryMethod );
-            }
-
-            // Bind a free function taking a single argument - the object to operate on (no placeholder string required)
-            template<typename C>
-            void bind( void (* unaryFunction)( C& ) ) {
-                m_arg->boundField = new Detail::BoundUnaryFunction<C>( unaryFunction );
-            }
-
-            // Bind a free function taking a single argument - the object to operate on (requires a placeholder string)
-            template<typename C, typename T>
-            void bind( void (* binaryFunction)( C&, T ), std::string const& placeholder ) {
-                m_arg->boundField = new Detail::BoundBinaryFunction<C, T>( binaryFunction );
-                m_arg->placeholder = placeholder;
-            }
-
-            ArgBuilder& describe( std::string const& description ) {
-                m_arg->description = description;
-                return *this;
-            }
-            ArgBuilder& detail( std::string const& detail ) {
-                m_arg->detail = detail;
-                return *this;
-            }
-
-        protected:
-            Arg* m_arg;
-        };
-
-        class OptBuilder : public ArgBuilder {
-        public:
-            OptBuilder( Arg* arg ) : ArgBuilder( arg ) {}
-            OptBuilder( OptBuilder& other ) : ArgBuilder( other ) {}
-
-            OptBuilder& operator[]( std::string const& optName ) {
-                addOptName( *ArgBuilder::m_arg, optName );
-                return *this;
-            }
-        };
-
-    public:
-
-        CommandLine()
-        :   m_boundProcessName( new Detail::NullBinder<ConfigT>() ),
-            m_highestSpecifiedArgPosition( 0 ),
-            m_throwOnUnrecognisedTokens( false )
-        {}
-        CommandLine( CommandLine const& other )
-        :   m_boundProcessName( other.m_boundProcessName ),
-            m_options ( other.m_options ),
-            m_positionalArgs( other.m_positionalArgs ),
-            m_highestSpecifiedArgPosition( other.m_highestSpecifiedArgPosition ),
-            m_throwOnUnrecognisedTokens( other.m_throwOnUnrecognisedTokens )
-        {
-            if( other.m_floatingArg.get() )
-                m_floatingArg.reset( new Arg( *other.m_floatingArg ) );
-        }
-
-        CommandLine& setThrowOnUnrecognisedTokens( bool shouldThrow = true ) {
-            m_throwOnUnrecognisedTokens = shouldThrow;
-            return *this;
-        }
-
-        OptBuilder operator[]( std::string const& optName ) {
-            m_options.push_back( Arg() );
-            addOptName( m_options.back(), optName );
-            OptBuilder builder( &m_options.back() );
-            return builder;
-        }
-
-        ArgBuilder operator[]( int position ) {
-            m_positionalArgs.insert( std::make_pair( position, Arg() ) );
-            if( position > m_highestSpecifiedArgPosition )
-                m_highestSpecifiedArgPosition = position;
-            setPositionalArg( m_positionalArgs[position], position );
-            ArgBuilder builder( &m_positionalArgs[position] );
-            return builder;
-        }
-
-        // Invoke this with the _ instance
-        ArgBuilder operator[]( UnpositionalTag ) {
-            if( m_floatingArg.get() )
-                throw std::logic_error( "Only one unpositional argument can be added" );
-            m_floatingArg.reset( new Arg() );
-            ArgBuilder builder( m_floatingArg.get() );
-            return builder;
-        }
-
-        template<typename C, typename M>
-        void bindProcessName( M C::* field ) {
-            m_boundProcessName = new Detail::BoundDataMember<C,M>( field );
-        }
-        template<typename C, typename M>
-        void bindProcessName( void (C::*_unaryMethod)( M ) ) {
-            m_boundProcessName = new Detail::BoundUnaryMethod<C,M>( _unaryMethod );
-        }
-
-        void optUsage( std::ostream& os, std::size_t indent = 0, std::size_t width = Detail::consoleWidth ) const {
-            typename std::vector<Arg>::const_iterator itBegin = m_options.begin(), itEnd = m_options.end(), it;
-            std::size_t maxWidth = 0;
-            for( it = itBegin; it != itEnd; ++it )
-                maxWidth = (std::max)( maxWidth, it->commands().size() );
-
-            for( it = itBegin; it != itEnd; ++it ) {
-                Detail::Text usage( it->commands(), Detail::TextAttributes()
-                                                        .setWidth( maxWidth+indent )
-                                                        .setIndent( indent ) );
-                Detail::Text desc( it->description, Detail::TextAttributes()
-                                                        .setWidth( width - maxWidth - 3 ) );
-
-                for( std::size_t i = 0; i < (std::max)( usage.size(), desc.size() ); ++i ) {
-                    std::string usageCol = i < usage.size() ? usage[i] : "";
-                    os << usageCol;
-
-                    if( i < desc.size() && !desc[i].empty() )
-                        os  << std::string( indent + 2 + maxWidth - usageCol.size(), ' ' )
-                            << desc[i];
-                    os << "\n";
-                }
-            }
-        }
-        std::string optUsage() const {
-            std::ostringstream oss;
-            optUsage( oss );
-            return oss.str();
-        }
-
-        void argSynopsis( std::ostream& os ) const {
-            for( int i = 1; i <= m_highestSpecifiedArgPosition; ++i ) {
-                if( i > 1 )
-                    os << " ";
-                typename std::map<int, Arg>::const_iterator it = m_positionalArgs.find( i );
-                if( it != m_positionalArgs.end() )
-                    os << "<" << it->second.placeholder << ">";
-                else if( m_floatingArg.get() )
-                    os << "<" << m_floatingArg->placeholder << ">";
-                else
-                    throw std::logic_error( "non consecutive positional arguments with no floating args" );
-            }
-            // !TBD No indication of mandatory args
-            if( m_floatingArg.get() ) {
-                if( m_highestSpecifiedArgPosition > 1 )
-                    os << " ";
-                os << "[<" << m_floatingArg->placeholder << "> ...]";
-            }
-        }
-        std::string argSynopsis() const {
-            std::ostringstream oss;
-            argSynopsis( oss );
-            return oss.str();
-        }
-
-        void usage( std::ostream& os, std::string const& procName ) const {
-            validate();
-            os << "usage:\n  " << procName << " ";
-            argSynopsis( os );
-            if( !m_options.empty() ) {
-                os << " [options]\n\nwhere options are: \n";
-                optUsage( os, 2 );
-            }
-            os << "\n";
-        }
-        std::string usage( std::string const& procName ) const {
-            std::ostringstream oss;
-            usage( oss, procName );
-            return oss.str();
-        }
-
-        ConfigT parse( std::vector<std::string> const& args ) const {
-            ConfigT config;
-            parseInto( args, config );
-            return config;
-        }
-
-        std::vector<Parser::Token> parseInto( std::vector<std::string> const& args, ConfigT& config ) const {
-            std::string processName = args[0];
-            std::size_t lastSlash = processName.find_last_of( "/\\" );
-            if( lastSlash != std::string::npos )
-                processName = processName.substr( lastSlash+1 );
-            m_boundProcessName.set( config, processName );
-            std::vector<Parser::Token> tokens;
-            Parser parser;
-            parser.parseIntoTokens( args, tokens );
-            return populate( tokens, config );
-        }
-
-        std::vector<Parser::Token> populate( std::vector<Parser::Token> const& tokens, ConfigT& config ) const {
-            validate();
-            std::vector<Parser::Token> unusedTokens = populateOptions( tokens, config );
-            unusedTokens = populateFixedArgs( unusedTokens, config );
-            unusedTokens = populateFloatingArgs( unusedTokens, config );
-            return unusedTokens;
-        }
-
-        std::vector<Parser::Token> populateOptions( std::vector<Parser::Token> const& tokens, ConfigT& config ) const {
-            std::vector<Parser::Token> unusedTokens;
-            std::vector<std::string> errors;
-            for( std::size_t i = 0; i < tokens.size(); ++i ) {
-                Parser::Token const& token = tokens[i];
-                typename std::vector<Arg>::const_iterator it = m_options.begin(), itEnd = m_options.end();
-                for(; it != itEnd; ++it ) {
-                    Arg const& arg = *it;
-
-                    try {
-                        if( ( token.type == Parser::Token::ShortOpt && arg.hasShortName( token.data ) ) ||
-                            ( token.type == Parser::Token::LongOpt && arg.hasLongName( token.data ) ) ) {
-                            if( arg.takesArg() ) {
-                                if( i == tokens.size()-1 || tokens[i+1].type != Parser::Token::Positional )
-                                    errors.push_back( "Expected argument to option: " + token.data );
-                                else
-                                    arg.boundField.set( config, tokens[++i].data );
-                            }
-                            else {
-                                arg.boundField.set( config, "true" );
-                            }
-                            break;
-                        }
-                    }
-                    catch( std::exception& ex ) {
-                        errors.push_back( std::string( ex.what() ) + "\n- while parsing: (" + arg.commands() + ")" );
-                    }
-                }
-                if( it == itEnd ) {
-                    if( token.type == Parser::Token::Positional || !m_throwOnUnrecognisedTokens )
-                        unusedTokens.push_back( token );
-                    else if( errors.empty() && m_throwOnUnrecognisedTokens )
-                        errors.push_back( "unrecognised option: " + token.data );
-                }
-            }
-            if( !errors.empty() ) {
-                std::ostringstream oss;
-                for( std::vector<std::string>::const_iterator it = errors.begin(), itEnd = errors.end();
-                        it != itEnd;
-                        ++it ) {
-                    if( it != errors.begin() )
-                        oss << "\n";
-                    oss << *it;
-                }
-                throw std::runtime_error( oss.str() );
-            }
-            return unusedTokens;
-        }
-        std::vector<Parser::Token> populateFixedArgs( std::vector<Parser::Token> const& tokens, ConfigT& config ) const {
-            std::vector<Parser::Token> unusedTokens;
-            int position = 1;
-            for( std::size_t i = 0; i < tokens.size(); ++i ) {
-                Parser::Token const& token = tokens[i];
-                typename std::map<int, Arg>::const_iterator it = m_positionalArgs.find( position );
-                if( it != m_positionalArgs.end() )
-                    it->second.boundField.set( config, token.data );
-                else
-                    unusedTokens.push_back( token );
-                if( token.type == Parser::Token::Positional )
-                    position++;
-            }
-            return unusedTokens;
-        }
-        std::vector<Parser::Token> populateFloatingArgs( std::vector<Parser::Token> const& tokens, ConfigT& config ) const {
-            if( !m_floatingArg.get() )
-                return tokens;
-            std::vector<Parser::Token> unusedTokens;
-            for( std::size_t i = 0; i < tokens.size(); ++i ) {
-                Parser::Token const& token = tokens[i];
-                if( token.type == Parser::Token::Positional )
-                    m_floatingArg->boundField.set( config, token.data );
-                else
-                    unusedTokens.push_back( token );
-            }
-            return unusedTokens;
-        }
-
-        void validate() const
-        {
-            if( m_options.empty() && m_positionalArgs.empty() && !m_floatingArg.get() )
-                throw std::logic_error( "No options or arguments specified" );
-
-            for( typename std::vector<Arg>::const_iterator  it = m_options.begin(),
-                                                            itEnd = m_options.end();
-                    it != itEnd; ++it )
-                it->validate();
-        }
-
-    private:
-        Detail::BoundArgFunction<ConfigT> m_boundProcessName;
-        std::vector<Arg> m_options;
-        std::map<int, Arg> m_positionalArgs;
-        ArgAutoPtr m_floatingArg;
-        int m_highestSpecifiedArgPosition;
-        bool m_throwOnUnrecognisedTokens;
-    };
-
-} // end namespace Clara
-
-STITCH_CLARA_CLOSE_NAMESPACE
-#undef STITCH_CLARA_OPEN_NAMESPACE
-#undef STITCH_CLARA_CLOSE_NAMESPACE
-
-#endif // TWOBLUECUBES_CLARA_H_INCLUDED
-#undef STITCH_CLARA_OPEN_NAMESPACE
-
-// Restore Clara's value for console width, if present
-#ifdef CATCH_TEMP_CLARA_CONFIG_CONSOLE_WIDTH
-#define CLARA_CONFIG_CONSOLE_WIDTH CATCH_TEMP_CLARA_CONFIG_CONSOLE_WIDTH
-#undef CATCH_TEMP_CLARA_CONFIG_CONSOLE_WIDTH
-#endif
-
-#include <fstream>
-
-namespace Catch {
-
-    inline void abortAfterFirst( ConfigData& config ) { config.abortAfter = 1; }
-    inline void abortAfterX( ConfigData& config, int x ) {
-        if( x < 1 )
-            throw std::runtime_error( "Value after -x or --abortAfter must be greater than zero" );
-        config.abortAfter = x;
-    }
-    inline void addTestOrTags( ConfigData& config, std::string const& _testSpec ) { config.testsOrTags.push_back( _testSpec ); }
-    inline void addReporterName( ConfigData& config, std::string const& _reporterName ) { config.reporterNames.push_back( _reporterName ); }
-
-    inline void addWarning( ConfigData& config, std::string const& _warning ) {
-        if( _warning == "NoAssertions" )
-            config.warnings = static_cast<WarnAbout::What>( config.warnings | WarnAbout::NoAssertions );
-        else
-            throw std::runtime_error( "Unrecognised warning: '" + _warning + "'" );
-    }
-    inline void setOrder( ConfigData& config, std::string const& order ) {
-        if( startsWith( "declared", order ) )
-            config.runOrder = RunTests::InDeclarationOrder;
-        else if( startsWith( "lexical", order ) )
-            config.runOrder = RunTests::InLexicographicalOrder;
-        else if( startsWith( "random", order ) )
-            config.runOrder = RunTests::InRandomOrder;
-        else
-            throw std::runtime_error( "Unrecognised ordering: '" + order + "'" );
-    }
-    inline void setRngSeed( ConfigData& config, std::string const& seed ) {
-        if( seed == "time" ) {
-            config.rngSeed = static_cast<unsigned int>( std::time(0) );
-        }
-        else {
-            std::stringstream ss;
-            ss << seed;
-            ss >> config.rngSeed;
-            if( ss.fail() )
-                throw std::runtime_error( "Argment to --rng-seed should be the word 'time' or a number" );
-        }
-    }
-    inline void setVerbosity( ConfigData& config, int level ) {
-        // !TBD: accept strings?
-        config.verbosity = static_cast<Verbosity::Level>( level );
-    }
-    inline void setShowDurations( ConfigData& config, bool _showDurations ) {
-        config.showDurations = _showDurations
-            ? ShowDurations::Always
-            : ShowDurations::Never;
-    }
-    inline void setUseColour( ConfigData& config, std::string const& value ) {
-        std::string mode = toLower( value );
-
-        if( mode == "yes" )
-            config.useColour = UseColour::Yes;
-        else if( mode == "no" )
-            config.useColour = UseColour::No;
-        else if( mode == "auto" )
-            config.useColour = UseColour::Auto;
-        else
-            throw std::runtime_error( "colour mode must be one of: auto, yes or no" );
-    }
-    inline void forceColour( ConfigData& config ) {
-        config.useColour = UseColour::Yes;
-    }
-    inline void loadTestNamesFromFile( ConfigData& config, std::string const& _filename ) {
-        std::ifstream f( _filename.c_str() );
-        if( !f.is_open() )
-            throw std::domain_error( "Unable to load input file: " + _filename );
-
-        std::string line;
-        while( std::getline( f, line ) ) {
-            line = trim(line);
-            if( !line.empty() && !startsWith( line, "#" ) )
-                addTestOrTags( config, "\"" + line + "\"," );
-        }
-    }
-
-    inline Clara::CommandLine<ConfigData> makeCommandLineParser() {
-
-        using namespace Clara;
-        CommandLine<ConfigData> cli;
-
-        cli.bindProcessName( &ConfigData::processName );
-
-        cli["-?"]["-h"]["--help"]
-            .describe( "display usage information" )
-            .bind( &ConfigData::showHelp );
-
-        cli["-l"]["--list-tests"]
-            .describe( "list all/matching test cases" )
-            .bind( &ConfigData::listTests );
-
-        cli["-t"]["--list-tags"]
-            .describe( "list all/matching tags" )
-            .bind( &ConfigData::listTags );
-
-        cli["-s"]["--success"]
-            .describe( "include successful tests in output" )
-            .bind( &ConfigData::showSuccessfulTests );
-
-        cli["-b"]["--break"]
-            .describe( "break into debugger on failure" )
-            .bind( &ConfigData::shouldDebugBreak );
-
-        cli["-e"]["--nothrow"]
-            .describe( "skip exception tests" )
-            .bind( &ConfigData::noThrow );
-
-        cli["-i"]["--invisibles"]
-            .describe( "show invisibles (tabs, newlines)" )
-            .bind( &ConfigData::showInvisibles );
-
-        cli["-o"]["--out"]
-            .describe( "output filename" )
-            .bind( &ConfigData::outputFilename, "filename" );
-
-        cli["-r"]["--reporter"]
-//            .placeholder( "name[:filename]" )
-            .describe( "reporter to use (defaults to console)" )
-            .bind( &addReporterName, "name" );
-
-        cli["-n"]["--name"]
-            .describe( "suite name" )
-            .bind( &ConfigData::name, "name" );
-
-        cli["-a"]["--abort"]
-            .describe( "abort at first failure" )
-            .bind( &abortAfterFirst );
-
-        cli["-x"]["--abortx"]
-            .describe( "abort after x failures" )
-            .bind( &abortAfterX, "no. failures" );
-
-        cli["-w"]["--warn"]
-            .describe( "enable warnings" )
-            .bind( &addWarning, "warning name" );
-
-// - needs updating if reinstated
-//        cli.into( &setVerbosity )
-//            .describe( "level of verbosity (0=no output)" )
-//            .shortOpt( "v")
-//            .longOpt( "verbosity" )
-//            .placeholder( "level" );
-
-        cli[_]
-            .describe( "which test or tests to use" )
-            .bind( &addTestOrTags, "test name, pattern or tags" );
-
-        cli["-d"]["--durations"]
-            .describe( "show test durations" )
-            .bind( &setShowDurations, "yes|no" );
-
-        cli["-f"]["--input-file"]
-            .describe( "load test names to run from a file" )
-            .bind( &loadTestNamesFromFile, "filename" );
-
-        cli["-#"]["--filenames-as-tags"]
-            .describe( "adds a tag for the filename" )
-            .bind( &ConfigData::filenamesAsTags );
-
-        // Less common commands which don't have a short form
-        cli["--list-test-names-only"]
-            .describe( "list all/matching test cases names only" )
-            .bind( &ConfigData::listTestNamesOnly );
-
-        cli["--list-reporters"]
-            .describe( "list all reporters" )
-            .bind( &ConfigData::listReporters );
-
-        cli["--order"]
-            .describe( "test case order (defaults to decl)" )
-            .bind( &setOrder, "decl|lex|rand" );
-
-        cli["--rng-seed"]
-            .describe( "set a specific seed for random numbers" )
-            .bind( &setRngSeed, "'time'|number" );
-
-        cli["--force-colour"]
-            .describe( "force colourised output (deprecated)" )
-            .bind( &forceColour );
-
-        cli["--use-colour"]
-            .describe( "should output be colourised" )
-            .bind( &setUseColour, "yes|no" );
-
-        return cli;
-    }
-
-} // end namespace Catch
-
-// #included from: internal/catch_list.hpp
-#define TWOBLUECUBES_CATCH_LIST_HPP_INCLUDED
-
-// #included from: catch_text.h
-#define TWOBLUECUBES_CATCH_TEXT_H_INCLUDED
-
-#define TBC_TEXT_FORMAT_CONSOLE_WIDTH CATCH_CONFIG_CONSOLE_WIDTH
-
-#define CLICHE_TBC_TEXT_FORMAT_OUTER_NAMESPACE Catch
-// #included from: ../external/tbc_text_format.h
-// Only use header guard if we are not using an outer namespace
-#ifndef CLICHE_TBC_TEXT_FORMAT_OUTER_NAMESPACE
-# ifdef TWOBLUECUBES_TEXT_FORMAT_H_INCLUDED
-#  ifndef TWOBLUECUBES_TEXT_FORMAT_H_ALREADY_INCLUDED
-#   define TWOBLUECUBES_TEXT_FORMAT_H_ALREADY_INCLUDED
-#  endif
-# else
-#  define TWOBLUECUBES_TEXT_FORMAT_H_INCLUDED
-# endif
-#endif
-#ifndef TWOBLUECUBES_TEXT_FORMAT_H_ALREADY_INCLUDED
-#include <string>
-#include <vector>
-#include <sstream>
-
-// Use optional outer namespace
-#ifdef CLICHE_TBC_TEXT_FORMAT_OUTER_NAMESPACE
-namespace CLICHE_TBC_TEXT_FORMAT_OUTER_NAMESPACE {
-#endif
-
-namespace Tbc {
-
-#ifdef TBC_TEXT_FORMAT_CONSOLE_WIDTH
-    const unsigned int consoleWidth = TBC_TEXT_FORMAT_CONSOLE_WIDTH;
-#else
-    const unsigned int consoleWidth = 80;
-#endif
-
-    struct TextAttributes {
-        TextAttributes()
-        :   initialIndent( std::string::npos ),
-            indent( 0 ),
-            width( consoleWidth-1 ),
-            tabChar( '\t' )
-        {}
-
-        TextAttributes& setInitialIndent( std::size_t _value )  { initialIndent = _value; return *this; }
-        TextAttributes& setIndent( std::size_t _value )         { indent = _value; return *this; }
-        TextAttributes& setWidth( std::size_t _value )          { width = _value; return *this; }
-        TextAttributes& setTabChar( char _value )               { tabChar = _value; return *this; }
-
-        std::size_t initialIndent;  // indent of first line, or npos
-        std::size_t indent;         // indent of subsequent lines, or all if initialIndent is npos
-        std::size_t width;          // maximum width of text, including indent. Longer text will wrap
-        char tabChar;               // If this char is seen the indent is changed to current pos
-    };
-
-    class Text {
-    public:
-        Text( std::string const& _str, TextAttributes const& _attr = TextAttributes() )
-        : attr( _attr )
-        {
-            std::string wrappableChars = " [({.,/|\\-";
-            std::size_t indent = _attr.initialIndent != std::string::npos
-                ? _attr.initialIndent
-                : _attr.indent;
-            std::string remainder = _str;
-
-            while( !remainder.empty() ) {
-                if( lines.size() >= 1000 ) {
-                    lines.push_back( "... message truncated due to excessive size" );
-                    return;
-                }
-                std::size_t tabPos = std::string::npos;
-                std::size_t width = (std::min)( remainder.size(), _attr.width - indent );
-                std::size_t pos = remainder.find_first_of( '\n' );
-                if( pos <= width ) {
-                    width = pos;
-                }
-                pos = remainder.find_last_of( _attr.tabChar, width );
-                if( pos != std::string::npos ) {
-                    tabPos = pos;
-                    if( remainder[width] == '\n' )
-                        width--;
-                    remainder = remainder.substr( 0, tabPos ) + remainder.substr( tabPos+1 );
-                }
-
-                if( width == remainder.size() ) {
-                    spliceLine( indent, remainder, width );
-                }
-                else if( remainder[width] == '\n' ) {
-                    spliceLine( indent, remainder, width );
-                    if( width <= 1 || remainder.size() != 1 )
-                        remainder = remainder.substr( 1 );
-                    indent = _attr.indent;
-                }
-                else {
-                    pos = remainder.find_last_of( wrappableChars, width );
-                    if( pos != std::string::npos && pos > 0 ) {
-                        spliceLine( indent, remainder, pos );
-                        if( remainder[0] == ' ' )
-                            remainder = remainder.substr( 1 );
-                    }
-                    else {
-                        spliceLine( indent, remainder, width-1 );
-                        lines.back() += "-";
-                    }
-                    if( lines.size() == 1 )
-                        indent = _attr.indent;
-                    if( tabPos != std::string::npos )
-                        indent += tabPos;
-                }
-            }
-        }
-
-        void spliceLine( std::size_t _indent, std::string& _remainder, std::size_t _pos ) {
-            lines.push_back( std::string( _indent, ' ' ) + _remainder.substr( 0, _pos ) );
-            _remainder = _remainder.substr( _pos );
-        }
-
-        typedef std::vector<std::string>::const_iterator const_iterator;
-
-        const_iterator begin() const { return lines.begin(); }
-        const_iterator end() const { return lines.end(); }
-        std::string const& last() const { return lines.back(); }
-        std::size_t size() const { return lines.size(); }
-        std::string const& operator[]( std::size_t _index ) const { return lines[_index]; }
-        std::string toString() const {
-            std::ostringstream oss;
-            oss << *this;
-            return oss.str();
-        }
-
-        inline friend std::ostream& operator << ( std::ostream& _stream, Text const& _text ) {
-            for( Text::const_iterator it = _text.begin(), itEnd = _text.end();
-                it != itEnd; ++it ) {
-                if( it != _text.begin() )
-                    _stream << "\n";
-                _stream << *it;
-            }
-            return _stream;
-        }
-
-    private:
-        std::string str;
-        TextAttributes attr;
-        std::vector<std::string> lines;
-    };
-
-} // end namespace Tbc
-
-#ifdef CLICHE_TBC_TEXT_FORMAT_OUTER_NAMESPACE
-} // end outer namespace
-#endif
-
-#endif // TWOBLUECUBES_TEXT_FORMAT_H_ALREADY_INCLUDED
-#undef CLICHE_TBC_TEXT_FORMAT_OUTER_NAMESPACE
-
-namespace Catch {
-    using Tbc::Text;
-    using Tbc::TextAttributes;
-}
-
-// #included from: catch_console_colour.hpp
-#define TWOBLUECUBES_CATCH_CONSOLE_COLOUR_HPP_INCLUDED
-
-namespace Catch {
-
-    struct Colour {
-        enum Code {
-            None = 0,
-
-            White,
-            Red,
-            Green,
-            Blue,
-            Cyan,
-            Yellow,
-            Grey,
-
-            Bright = 0x10,
-
-            BrightRed = Bright | Red,
-            BrightGreen = Bright | Green,
-            LightGrey = Bright | Grey,
-            BrightWhite = Bright | White,
-
-            // By intention
-            FileName = LightGrey,
-            Warning = Yellow,
-            ResultError = BrightRed,
-            ResultSuccess = BrightGreen,
-            ResultExpectedFailure = Warning,
-
-            Error = BrightRed,
-            Success = Green,
-
-            OriginalExpression = Cyan,
-            ReconstructedExpression = Yellow,
-
-            SecondaryText = LightGrey,
-            Headers = White
-        };
-
-        // Use constructed object for RAII guard
-        Colour( Code _colourCode );
-        Colour( Colour const& other );
-        ~Colour();
-
-        // Use static method for one-shot changes
-        static void use( Code _colourCode );
-
-    private:
-        bool m_moved;
-    };
-
-    inline std::ostream& operator << ( std::ostream& os, Colour const& ) { return os; }
-
-} // end namespace Catch
-
-// #included from: catch_interfaces_reporter.h
-#define TWOBLUECUBES_CATCH_INTERFACES_REPORTER_H_INCLUDED
-
-#include <string>
-#include <ostream>
-#include <map>
-#include <assert.h>
-
-namespace Catch
-{
-    struct ReporterConfig {
-        explicit ReporterConfig( Ptr<IConfig const> const& _fullConfig )
-        :   m_stream( &_fullConfig->stream() ), m_fullConfig( _fullConfig ) {}
-
-        ReporterConfig( Ptr<IConfig const> const& _fullConfig, std::ostream& _stream )
-        :   m_stream( &_stream ), m_fullConfig( _fullConfig ) {}
-
-        std::ostream& stream() const    { return *m_stream; }
-        Ptr<IConfig const> fullConfig() const { return m_fullConfig; }
-
-    private:
-        std::ostream* m_stream;
-        Ptr<IConfig const> m_fullConfig;
-    };
-
-    struct ReporterPreferences {
-        ReporterPreferences()
-        : shouldRedirectStdOut( false )
-        {}
-
-        bool shouldRedirectStdOut;
-    };
-
-    template<typename T>
-    struct LazyStat : Option<T> {
-        LazyStat() : used( false ) {}
-        LazyStat& operator=( T const& _value ) {
-            Option<T>::operator=( _value );
-            used = false;
-            return *this;
-        }
-        void reset() {
-            Option<T>::reset();
-            used = false;
-        }
-        bool used;
-    };
-
-    struct TestRunInfo {
-        TestRunInfo( std::string const& _name ) : name( _name ) {}
-        std::string name;
-    };
-    struct GroupInfo {
-        GroupInfo(  std::string const& _name,
-                    std::size_t _groupIndex,
-                    std::size_t _groupsCount )
-        :   name( _name ),
-            groupIndex( _groupIndex ),
-            groupsCounts( _groupsCount )
-        {}
-
-        std::string name;
-        std::size_t groupIndex;
-        std::size_t groupsCounts;
-    };
-
-    struct AssertionStats {
-        AssertionStats( AssertionResult const& _assertionResult,
-                        std::vector<MessageInfo> const& _infoMessages,
-                        Totals const& _totals )
-        :   assertionResult( _assertionResult ),
-            infoMessages( _infoMessages ),
-            totals( _totals )
-        {
-            if( assertionResult.hasMessage() ) {
-                // Copy message into messages list.
-                // !TBD This should have been done earlier, somewhere
-                MessageBuilder builder( assertionResult.getTestMacroName(), assertionResult.getSourceInfo(), assertionResult.getResultType() );
-                builder << assertionResult.getMessage();
-                builder.m_info.message = builder.m_stream.str();
-
-                infoMessages.push_back( builder.m_info );
-            }
-        }
-        virtual ~AssertionStats();
-
-#  ifdef CATCH_CONFIG_CPP11_GENERATED_METHODS
-        AssertionStats( AssertionStats const& )              = default;
-        AssertionStats( AssertionStats && )                  = default;
-        AssertionStats& operator = ( AssertionStats const& ) = default;
-        AssertionStats& operator = ( AssertionStats && )     = default;
-#  endif
-
-        AssertionResult assertionResult;
-        std::vector<MessageInfo> infoMessages;
-        Totals totals;
-    };
-
-    struct SectionStats {
-        SectionStats(   SectionInfo const& _sectionInfo,
-                        Counts const& _assertions,
-                        double _durationInSeconds,
-                        bool _missingAssertions )
-        :   sectionInfo( _sectionInfo ),
-            assertions( _assertions ),
-            durationInSeconds( _durationInSeconds ),
-            missingAssertions( _missingAssertions )
-        {}
-        virtual ~SectionStats();
-#  ifdef CATCH_CONFIG_CPP11_GENERATED_METHODS
-        SectionStats( SectionStats const& )              = default;
-        SectionStats( SectionStats && )                  = default;
-        SectionStats& operator = ( SectionStats const& ) = default;
-        SectionStats& operator = ( SectionStats && )     = default;
-#  endif
-
-        SectionInfo sectionInfo;
-        Counts assertions;
-        double durationInSeconds;
-        bool missingAssertions;
-    };
-
-    struct TestCaseStats {
-        TestCaseStats(  TestCaseInfo const& _testInfo,
-                        Totals const& _totals,
-                        std::string const& _stdOut,
-                        std::string const& _stdErr,
-                        bool _aborting )
-        : testInfo( _testInfo ),
-            totals( _totals ),
-            stdOut( _stdOut ),
-            stdErr( _stdErr ),
-            aborting( _aborting )
-        {}
-        virtual ~TestCaseStats();
-
-#  ifdef CATCH_CONFIG_CPP11_GENERATED_METHODS
-        TestCaseStats( TestCaseStats const& )              = default;
-        TestCaseStats( TestCaseStats && )                  = default;
-        TestCaseStats& operator = ( TestCaseStats const& ) = default;
-        TestCaseStats& operator = ( TestCaseStats && )     = default;
-#  endif
-
-        TestCaseInfo testInfo;
-        Totals totals;
-        std::string stdOut;
-        std::string stdErr;
-        bool aborting;
-    };
-
-    struct TestGroupStats {
-        TestGroupStats( GroupInfo const& _groupInfo,
-                        Totals const& _totals,
-                        bool _aborting )
-        :   groupInfo( _groupInfo ),
-            totals( _totals ),
-            aborting( _aborting )
-        {}
-        TestGroupStats( GroupInfo const& _groupInfo )
-        :   groupInfo( _groupInfo ),
-            aborting( false )
-        {}
-        virtual ~TestGroupStats();
-
-#  ifdef CATCH_CONFIG_CPP11_GENERATED_METHODS
-        TestGroupStats( TestGroupStats const& )              = default;
-        TestGroupStats( TestGroupStats && )                  = default;
-        TestGroupStats& operator = ( TestGroupStats const& ) = default;
-        TestGroupStats& operator = ( TestGroupStats && )     = default;
-#  endif
-
-        GroupInfo groupInfo;
-        Totals totals;
-        bool aborting;
-    };
-
-    struct TestRunStats {
-        TestRunStats(   TestRunInfo const& _runInfo,
-                        Totals const& _totals,
-                        bool _aborting )
-        :   runInfo( _runInfo ),
-            totals( _totals ),
-            aborting( _aborting )
-        {}
-        virtual ~TestRunStats();
-
-#  ifndef CATCH_CONFIG_CPP11_GENERATED_METHODS
-        TestRunStats( TestRunStats const& _other )
-        :   runInfo( _other.runInfo ),
-            totals( _other.totals ),
-            aborting( _other.aborting )
-        {}
-#  else
-        TestRunStats( TestRunStats const& )              = default;
-        TestRunStats( TestRunStats && )                  = default;
-        TestRunStats& operator = ( TestRunStats const& ) = default;
-        TestRunStats& operator = ( TestRunStats && )     = default;
-#  endif
-
-        TestRunInfo runInfo;
-        Totals totals;
-        bool aborting;
-    };
-
-    class MultipleReporters;
-
-    struct IStreamingReporter : IShared {
-        virtual ~IStreamingReporter();
-
-        // Implementing class must also provide the following static method:
-        // static std::string getDescription();
-
-        virtual ReporterPreferences getPreferences() const = 0;
-
-        virtual void noMatchingTestCases( std::string const& spec ) = 0;
-
-        virtual void testRunStarting( TestRunInfo const& testRunInfo ) = 0;
-        virtual void testGroupStarting( GroupInfo const& groupInfo ) = 0;
-
-        virtual void testCaseStarting( TestCaseInfo const& testInfo ) = 0;
-        virtual void sectionStarting( SectionInfo const& sectionInfo ) = 0;
-
-        virtual void assertionStarting( AssertionInfo const& assertionInfo ) = 0;
-
-        // The return value indicates if the messages buffer should be cleared:
-        virtual bool assertionEnded( AssertionStats const& assertionStats ) = 0;
-
-        virtual void sectionEnded( SectionStats const& sectionStats ) = 0;
-        virtual void testCaseEnded( TestCaseStats const& testCaseStats ) = 0;
-        virtual void testGroupEnded( TestGroupStats const& testGroupStats ) = 0;
-        virtual void testRunEnded( TestRunStats const& testRunStats ) = 0;
-
-        virtual void skipTest( TestCaseInfo const& testInfo ) = 0;
-
-        virtual MultipleReporters* tryAsMulti() { return CATCH_NULL; }
-    };
-
-    struct IReporterFactory : IShared {
-        virtual ~IReporterFactory();
-        virtual IStreamingReporter* create( ReporterConfig const& config ) const = 0;
-        virtual std::string getDescription() const = 0;
-    };
-
-    struct IReporterRegistry {
-        typedef std::map<std::string, Ptr<IReporterFactory> > FactoryMap;
-        typedef std::vector<Ptr<IReporterFactory> > Listeners;
-
-        virtual ~IReporterRegistry();
-        virtual IStreamingReporter* create( std::string const& name, Ptr<IConfig const> const& config ) const = 0;
-        virtual FactoryMap const& getFactories() const = 0;
-        virtual Listeners const& getListeners() const = 0;
-    };
-
-    Ptr<IStreamingReporter> addReporter( Ptr<IStreamingReporter> const& existingReporter, Ptr<IStreamingReporter> const& additionalReporter );
-
-}
-
-#include <limits>
-#include <algorithm>
-
-namespace Catch {
-
-    inline std::size_t listTests( Config const& config ) {
-
-        TestSpec testSpec = config.testSpec();
-        if( config.testSpec().hasFilters() )
-            Catch::cout() << "Matching test cases:\n";
-        else {
-            Catch::cout() << "All available test cases:\n";
-            testSpec = TestSpecParser( ITagAliasRegistry::get() ).parse( "*" ).testSpec();
-        }
-
-        std::size_t matchedTests = 0;
-        TextAttributes nameAttr, tagsAttr;
-        nameAttr.setInitialIndent( 2 ).setIndent( 4 );
-        tagsAttr.setIndent( 6 );
-
-        std::vector<TestCase> matchedTestCases = filterTests( getAllTestCasesSorted( config ), testSpec, config );
-        for( std::vector<TestCase>::const_iterator it = matchedTestCases.begin(), itEnd = matchedTestCases.end();
-                it != itEnd;
-                ++it ) {
-            matchedTests++;
-            TestCaseInfo const& testCaseInfo = it->getTestCaseInfo();
-            Colour::Code colour = testCaseInfo.isHidden()
-                ? Colour::SecondaryText
-                : Colour::None;
-            Colour colourGuard( colour );
-
-            Catch::cout() << Text( testCaseInfo.name, nameAttr ) << std::endl;
-            if( !testCaseInfo.tags.empty() )
-                Catch::cout() << Text( testCaseInfo.tagsAsString, tagsAttr ) << std::endl;
-        }
-
-        if( !config.testSpec().hasFilters() )
-            Catch::cout() << pluralise( matchedTests, "test case" ) << "\n" << std::endl;
-        else
-            Catch::cout() << pluralise( matchedTests, "matching test case" ) << "\n" << std::endl;
-        return matchedTests;
-    }
-
-    inline std::size_t listTestsNamesOnly( Config const& config ) {
-        TestSpec testSpec = config.testSpec();
-        if( !config.testSpec().hasFilters() )
-            testSpec = TestSpecParser( ITagAliasRegistry::get() ).parse( "*" ).testSpec();
-        std::size_t matchedTests = 0;
-        std::vector<TestCase> matchedTestCases = filterTests( getAllTestCasesSorted( config ), testSpec, config );
-        for( std::vector<TestCase>::const_iterator it = matchedTestCases.begin(), itEnd = matchedTestCases.end();
-                it != itEnd;
-                ++it ) {
-            matchedTests++;
-            TestCaseInfo const& testCaseInfo = it->getTestCaseInfo();
-            Catch::cout() << testCaseInfo.name << std::endl;
-        }
-        return matchedTests;
-    }
-
-    struct TagInfo {
-        TagInfo() : count ( 0 ) {}
-        void add( std::string const& spelling ) {
-            ++count;
-            spellings.insert( spelling );
-        }
-        std::string all() const {
-            std::string out;
-            for( std::set<std::string>::const_iterator it = spellings.begin(), itEnd = spellings.end();
-                        it != itEnd;
-                        ++it )
-                out += "[" + *it + "]";
-            return out;
-        }
-        std::set<std::string> spellings;
-        std::size_t count;
-    };
-
-    inline std::size_t listTags( Config const& config ) {
-        TestSpec testSpec = config.testSpec();
-        if( config.testSpec().hasFilters() )
-            Catch::cout() << "Tags for matching test cases:\n";
-        else {
-            Catch::cout() << "All available tags:\n";
-            testSpec = TestSpecParser( ITagAliasRegistry::get() ).parse( "*" ).testSpec();
-        }
-
-        std::map<std::string, TagInfo> tagCounts;
-
-        std::vector<TestCase> matchedTestCases = filterTests( getAllTestCasesSorted( config ), testSpec, config );
-        for( std::vector<TestCase>::const_iterator it = matchedTestCases.begin(), itEnd = matchedTestCases.end();
-                it != itEnd;
-                ++it ) {
-            for( std::set<std::string>::const_iterator  tagIt = it->getTestCaseInfo().tags.begin(),
-                                                        tagItEnd = it->getTestCaseInfo().tags.end();
-                    tagIt != tagItEnd;
-                    ++tagIt ) {
-                std::string tagName = *tagIt;
-                std::string lcaseTagName = toLower( tagName );
-                std::map<std::string, TagInfo>::iterator countIt = tagCounts.find( lcaseTagName );
-                if( countIt == tagCounts.end() )
-                    countIt = tagCounts.insert( std::make_pair( lcaseTagName, TagInfo() ) ).first;
-                countIt->second.add( tagName );
-            }
-        }
-
-        for( std::map<std::string, TagInfo>::const_iterator countIt = tagCounts.begin(),
-                                                            countItEnd = tagCounts.end();
-                countIt != countItEnd;
-                ++countIt ) {
-            std::ostringstream oss;
-            oss << "  " << std::setw(2) << countIt->second.count << "  ";
-            Text wrapper( countIt->second.all(), TextAttributes()
-                                                    .setInitialIndent( 0 )
-                                                    .setIndent( oss.str().size() )
-                                                    .setWidth( CATCH_CONFIG_CONSOLE_WIDTH-10 ) );
-            Catch::cout() << oss.str() << wrapper << "\n";
-        }
-        Catch::cout() << pluralise( tagCounts.size(), "tag" ) << "\n" << std::endl;
-        return tagCounts.size();
-    }
-
-    inline std::size_t listReporters( Config const& /*config*/ ) {
-        Catch::cout() << "Available reporters:\n";
-        IReporterRegistry::FactoryMap const& factories = getRegistryHub().getReporterRegistry().getFactories();
-        IReporterRegistry::FactoryMap::const_iterator itBegin = factories.begin(), itEnd = factories.end(), it;
-        std::size_t maxNameLen = 0;
-        for(it = itBegin; it != itEnd; ++it )
-            maxNameLen = (std::max)( maxNameLen, it->first.size() );
-
-        for(it = itBegin; it != itEnd; ++it ) {
-            Text wrapper( it->second->getDescription(), TextAttributes()
-                                                        .setInitialIndent( 0 )
-                                                        .setIndent( 7+maxNameLen )
-                                                        .setWidth( CATCH_CONFIG_CONSOLE_WIDTH - maxNameLen-8 ) );
-            Catch::cout() << "  "
-                    << it->first
-                    << ":"
-                    << std::string( maxNameLen - it->first.size() + 2, ' ' )
-                    << wrapper << "\n";
-        }
-        Catch::cout() << std::endl;
-        return factories.size();
-    }
-
-    inline Option<std::size_t> list( Config const& config ) {
-        Option<std::size_t> listedCount;
-        if( config.listTests() )
-            listedCount = listedCount.valueOr(0) + listTests( config );
-        if( config.listTestNamesOnly() )
-            listedCount = listedCount.valueOr(0) + listTestsNamesOnly( config );
-        if( config.listTags() )
-            listedCount = listedCount.valueOr(0) + listTags( config );
-        if( config.listReporters() )
-            listedCount = listedCount.valueOr(0) + listReporters( config );
-        return listedCount;
-    }
-
-} // end namespace Catch
-
-// #included from: internal/catch_run_context.hpp
-#define TWOBLUECUBES_CATCH_RUNNER_IMPL_HPP_INCLUDED
-
-// #included from: catch_test_case_tracker.hpp
-#define TWOBLUECUBES_CATCH_TEST_CASE_TRACKER_HPP_INCLUDED
-
-#include <map>
-#include <string>
-#include <assert.h>
-#include <vector>
-
-namespace Catch {
-namespace TestCaseTracking {
-
-    struct ITracker : SharedImpl<> {
-        virtual ~ITracker();
-
-        // static queries
-        virtual std::string name() const = 0;
-
-        // dynamic queries
-        virtual bool isComplete() const = 0; // Successfully completed or failed
-        virtual bool isSuccessfullyCompleted() const = 0;
-        virtual bool isOpen() const = 0; // Started but not complete
-        virtual bool hasChildren() const = 0;
-
-        virtual ITracker& parent() = 0;
-
-        // actions
-        virtual void close() = 0; // Successfully complete
-        virtual void fail() = 0;
-        virtual void markAsNeedingAnotherRun() = 0;
-
-        virtual void addChild( Ptr<ITracker> const& child ) = 0;
-        virtual ITracker* findChild( std::string const& name ) = 0;
-        virtual void openChild() = 0;
-
-        // Debug/ checking
-        virtual bool isSectionTracker() const = 0;
-        virtual bool isIndexTracker() const = 0;
-    };
-
-    class TrackerContext {
-
-        enum RunState {
-            NotStarted,
-            Executing,
-            CompletedCycle
-        };
-
-        Ptr<ITracker> m_rootTracker;
-        ITracker* m_currentTracker;
-        RunState m_runState;
-
-    public:
-
-        static TrackerContext& instance() {
-            static TrackerContext s_instance;
-            return s_instance;
-        }
-
-        TrackerContext()
-        :   m_currentTracker( CATCH_NULL ),
-            m_runState( NotStarted )
-        {}
-
-        ITracker& startRun();
-
-        void endRun() {
-            m_rootTracker.reset();
-            m_currentTracker = CATCH_NULL;
-            m_runState = NotStarted;
-        }
-
-        void startCycle() {
-            m_currentTracker = m_rootTracker.get();
-            m_runState = Executing;
-        }
-        void completeCycle() {
-            m_runState = CompletedCycle;
-        }
-
-        bool completedCycle() const {
-            return m_runState == CompletedCycle;
-        }
-        ITracker& currentTracker() {
-            return *m_currentTracker;
-        }
-        void setCurrentTracker( ITracker* tracker ) {
-            m_currentTracker = tracker;
-        }
-    };
-
-    class TrackerBase : public ITracker {
-    protected:
-        enum CycleState {
-            NotStarted,
-            Executing,
-            ExecutingChildren,
-            NeedsAnotherRun,
-            CompletedSuccessfully,
-            Failed
-        };
-        class TrackerHasName {
-            std::string m_name;
-        public:
-            TrackerHasName( std::string const& name ) : m_name( name ) {}
-            bool operator ()( Ptr<ITracker> const& tracker ) {
-                return tracker->name() == m_name;
-            }
-        };
-        typedef std::vector<Ptr<ITracker> > Children;
-        std::string m_name;
-        TrackerContext& m_ctx;
-        ITracker* m_parent;
-        Children m_children;
-        CycleState m_runState;
-    public:
-        TrackerBase( std::string const& name, TrackerContext& ctx, ITracker* parent )
-        :   m_name( name ),
-            m_ctx( ctx ),
-            m_parent( parent ),
-            m_runState( NotStarted )
-        {}
-        virtual ~TrackerBase();
-
-        virtual std::string name() const CATCH_OVERRIDE {
-            return m_name;
-        }
-        virtual bool isComplete() const CATCH_OVERRIDE {
-            return m_runState == CompletedSuccessfully || m_runState == Failed;
-        }
-        virtual bool isSuccessfullyCompleted() const CATCH_OVERRIDE {
-            return m_runState == CompletedSuccessfully;
-        }
-        virtual bool isOpen() const CATCH_OVERRIDE {
-            return m_runState != NotStarted && !isComplete();
-        }
-        virtual bool hasChildren() const CATCH_OVERRIDE {
-            return !m_children.empty();
-        }
-
-        virtual void addChild( Ptr<ITracker> const& child ) CATCH_OVERRIDE {
-            m_children.push_back( child );
-        }
-
-        virtual ITracker* findChild( std::string const& name ) CATCH_OVERRIDE {
-            Children::const_iterator it = std::find_if( m_children.begin(), m_children.end(), TrackerHasName( name ) );
-            return( it != m_children.end() )
-                ? it->get()
-                : CATCH_NULL;
-        }
-        virtual ITracker& parent() CATCH_OVERRIDE {
-            assert( m_parent ); // Should always be non-null except for root
-            return *m_parent;
-        }
-
-        virtual void openChild() CATCH_OVERRIDE {
-            if( m_runState != ExecutingChildren ) {
-                m_runState = ExecutingChildren;
-                if( m_parent )
-                    m_parent->openChild();
-            }
-        }
-
-        virtual bool isSectionTracker() const CATCH_OVERRIDE { return false; }
-        virtual bool isIndexTracker() const CATCH_OVERRIDE { return false; }
-
-        void open() {
-            m_runState = Executing;
-            moveToThis();
-            if( m_parent )
-                m_parent->openChild();
-        }
-
-        virtual void close() CATCH_OVERRIDE {
-
-            // Close any still open children (e.g. generators)
-            while( &m_ctx.currentTracker() != this )
-                m_ctx.currentTracker().close();
-
-            switch( m_runState ) {
-                case NotStarted:
-                case CompletedSuccessfully:
-                case Failed:
-                    throw std::logic_error( "Illogical state" );
-
-                case NeedsAnotherRun:
-                    break;;
-
-                case Executing:
-                    m_runState = CompletedSuccessfully;
-                    break;
-                case ExecutingChildren:
-                    if( m_children.empty() || m_children.back()->isComplete() )
-                        m_runState = CompletedSuccessfully;
-                    break;
-
-                default:
-                    throw std::logic_error( "Unexpected state" );
-            }
-            moveToParent();
-            m_ctx.completeCycle();
-        }
-        virtual void fail() CATCH_OVERRIDE {
-            m_runState = Failed;
-            if( m_parent )
-                m_parent->markAsNeedingAnotherRun();
-            moveToParent();
-            m_ctx.completeCycle();
-        }
-        virtual void markAsNeedingAnotherRun() CATCH_OVERRIDE {
-            m_runState = NeedsAnotherRun;
-        }
-    private:
-        void moveToParent() {
-            assert( m_parent );
-            m_ctx.setCurrentTracker( m_parent );
-        }
-        void moveToThis() {
-            m_ctx.setCurrentTracker( this );
-        }
-    };
-
-    class SectionTracker : public TrackerBase {
-    public:
-        SectionTracker( std::string const& name, TrackerContext& ctx, ITracker* parent )
-        :   TrackerBase( name, ctx, parent )
-        {}
-        virtual ~SectionTracker();
-
-        virtual bool isSectionTracker() const CATCH_OVERRIDE { return true; }
-
-        static SectionTracker& acquire( TrackerContext& ctx, std::string const& name ) {
-            SectionTracker* section = CATCH_NULL;
-
-            ITracker& currentTracker = ctx.currentTracker();
-            if( ITracker* childTracker = currentTracker.findChild( name ) ) {
-                assert( childTracker );
-                assert( childTracker->isSectionTracker() );
-                section = static_cast<SectionTracker*>( childTracker );
-            }
-            else {
-                section = new SectionTracker( name, ctx, &currentTracker );
-                currentTracker.addChild( section );
-            }
-            if( !ctx.completedCycle() && !section->isComplete() ) {
-
-                section->open();
-            }
-            return *section;
-        }
-    };
-
-    class IndexTracker : public TrackerBase {
-        int m_size;
-        int m_index;
-    public:
-        IndexTracker( std::string const& name, TrackerContext& ctx, ITracker* parent, int size )
-        :   TrackerBase( name, ctx, parent ),
-            m_size( size ),
-            m_index( -1 )
-        {}
-        virtual ~IndexTracker();
-
-        virtual bool isIndexTracker() const CATCH_OVERRIDE { return true; }
-
-        static IndexTracker& acquire( TrackerContext& ctx, std::string const& name, int size ) {
-            IndexTracker* tracker = CATCH_NULL;
-
-            ITracker& currentTracker = ctx.currentTracker();
-            if( ITracker* childTracker = currentTracker.findChild( name ) ) {
-                assert( childTracker );
-                assert( childTracker->isIndexTracker() );
-                tracker = static_cast<IndexTracker*>( childTracker );
-            }
-            else {
-                tracker = new IndexTracker( name, ctx, &currentTracker, size );
-                currentTracker.addChild( tracker );
-            }
-
-            if( !ctx.completedCycle() && !tracker->isComplete() ) {
-                if( tracker->m_runState != ExecutingChildren && tracker->m_runState != NeedsAnotherRun )
-                    tracker->moveNext();
-                tracker->open();
-            }
-
-            return *tracker;
-        }
-
-        int index() const { return m_index; }
-
-        void moveNext() {
-            m_index++;
-            m_children.clear();
-        }
-
-        virtual void close() CATCH_OVERRIDE {
-            TrackerBase::close();
-            if( m_runState == CompletedSuccessfully && m_index < m_size-1 )
-                m_runState = Executing;
-        }
-    };
-
-    inline ITracker& TrackerContext::startRun() {
-        m_rootTracker = new SectionTracker( "{root}", *this, CATCH_NULL );
-        m_currentTracker = CATCH_NULL;
-        m_runState = Executing;
-        return *m_rootTracker;
-    }
-
-} // namespace TestCaseTracking
-
-using TestCaseTracking::ITracker;
-using TestCaseTracking::TrackerContext;
-using TestCaseTracking::SectionTracker;
-using TestCaseTracking::IndexTracker;
-
-} // namespace Catch
-
-// #included from: catch_fatal_condition.hpp
-#define TWOBLUECUBES_CATCH_FATAL_CONDITION_H_INCLUDED
-
-namespace Catch {
-
-    // Report the error condition then exit the process
-    inline void fatal( std::string const& message, int exitCode ) {
-        IContext& context = Catch::getCurrentContext();
-        IResultCapture* resultCapture = context.getResultCapture();
-        resultCapture->handleFatalErrorCondition( message );
-
-		if( Catch::alwaysTrue() ) // avoids "no return" warnings
-            exit( exitCode );
-    }
-
-} // namespace Catch
-
-#if defined ( CATCH_PLATFORM_WINDOWS ) /////////////////////////////////////////
-
-namespace Catch {
-
-    struct FatalConditionHandler {
-		void reset() {}
-	};
-
-} // namespace Catch
-
-#else // Not Windows - assumed to be POSIX compatible //////////////////////////
-
-#include <signal.h>
-
-namespace Catch {
-
-    struct SignalDefs { int id; const char* name; };
-    extern SignalDefs signalDefs[];
-    SignalDefs signalDefs[] = {
-            { SIGINT,  "SIGINT - Terminal interrupt signal" },
-            { SIGILL,  "SIGILL - Illegal instruction signal" },
-            { SIGFPE,  "SIGFPE - Floating point error signal" },
-            { SIGSEGV, "SIGSEGV - Segmentation violation signal" },
-            { SIGTERM, "SIGTERM - Termination request signal" },
-            { SIGABRT, "SIGABRT - Abort (abnormal termination) signal" }
-        };
-
-    struct FatalConditionHandler {
-
-        static void handleSignal( int sig ) {
-            for( std::size_t i = 0; i < sizeof(signalDefs)/sizeof(SignalDefs); ++i )
-                if( sig == signalDefs[i].id )
-                    fatal( signalDefs[i].name, -sig );
-            fatal( "<unknown signal>", -sig );
-        }
-
-        FatalConditionHandler() : m_isSet( true ) {
-            for( std::size_t i = 0; i < sizeof(signalDefs)/sizeof(SignalDefs); ++i )
-                signal( signalDefs[i].id, handleSignal );
-        }
-        ~FatalConditionHandler() {
-            reset();
-        }
-        void reset() {
-            if( m_isSet ) {
-                for( std::size_t i = 0; i < sizeof(signalDefs)/sizeof(SignalDefs); ++i )
-                    signal( signalDefs[i].id, SIG_DFL );
-                m_isSet = false;
-            }
-        }
-
-        bool m_isSet;
-    };
-
-} // namespace Catch
-
-#endif // not Windows
-
-#include <set>
-#include <string>
-
-namespace Catch {
-
-    class StreamRedirect {
-
-    public:
-        StreamRedirect( std::ostream& stream, std::string& targetString )
-        :   m_stream( stream ),
-            m_prevBuf( stream.rdbuf() ),
-            m_targetString( targetString )
-        {
-            stream.rdbuf( m_oss.rdbuf() );
-        }
-
-        ~StreamRedirect() {
-            m_targetString += m_oss.str();
-            m_stream.rdbuf( m_prevBuf );
-        }
-
-    private:
-        std::ostream& m_stream;
-        std::streambuf* m_prevBuf;
-        std::ostringstream m_oss;
-        std::string& m_targetString;
-    };
-
-    ///////////////////////////////////////////////////////////////////////////
-
-    class RunContext : public IResultCapture, public IRunner {
-
-        RunContext( RunContext const& );
-        void operator =( RunContext const& );
-
-    public:
-
-        explicit RunContext( Ptr<IConfig const> const& _config, Ptr<IStreamingReporter> const& reporter )
-        :   m_runInfo( _config->name() ),
-            m_context( getCurrentMutableContext() ),
-            m_activeTestCase( CATCH_NULL ),
-            m_config( _config ),
-            m_reporter( reporter )
-        {
-            m_context.setRunner( this );
-            m_context.setConfig( m_config );
-            m_context.setResultCapture( this );
-            m_reporter->testRunStarting( m_runInfo );
-        }
-
-        virtual ~RunContext() {
-            m_reporter->testRunEnded( TestRunStats( m_runInfo, m_totals, aborting() ) );
-        }
-
-        void testGroupStarting( std::string const& testSpec, std::size_t groupIndex, std::size_t groupsCount ) {
-            m_reporter->testGroupStarting( GroupInfo( testSpec, groupIndex, groupsCount ) );
-        }
-        void testGroupEnded( std::string const& testSpec, Totals const& totals, std::size_t groupIndex, std::size_t groupsCount ) {
-            m_reporter->testGroupEnded( TestGroupStats( GroupInfo( testSpec, groupIndex, groupsCount ), totals, aborting() ) );
-        }
-
-        Totals runTest( TestCase const& testCase ) {
-            Totals prevTotals = m_totals;
-
-            std::string redirectedCout;
-            std::string redirectedCerr;
-
-            TestCaseInfo testInfo = testCase.getTestCaseInfo();
-
-            m_reporter->testCaseStarting( testInfo );
-
-            m_activeTestCase = &testCase;
-
-            do {
-                m_trackerContext.startRun();
-                do {
-                    m_trackerContext.startCycle();
-                    m_testCaseTracker = &SectionTracker::acquire( m_trackerContext, testInfo.name );
-                    runCurrentTest( redirectedCout, redirectedCerr );
-                }
-                while( !m_testCaseTracker->isSuccessfullyCompleted() && !aborting() );
-            }
-            // !TBD: deprecated - this will be replaced by indexed trackers
-            while( getCurrentContext().advanceGeneratorsForCurrentTest() && !aborting() );
-
-            Totals deltaTotals = m_totals.delta( prevTotals );
-            if( testInfo.expectedToFail() && deltaTotals.testCases.passed > 0 ) {
-                deltaTotals.assertions.failed++;
-                deltaTotals.testCases.passed--;
-                deltaTotals.testCases.failed++;
-            }
-            m_totals.testCases += deltaTotals.testCases;
-            m_reporter->testCaseEnded( TestCaseStats(   testInfo,
-                                                        deltaTotals,
-                                                        redirectedCout,
-                                                        redirectedCerr,
-                                                        aborting() ) );
-
-            m_activeTestCase = CATCH_NULL;
-            m_testCaseTracker = CATCH_NULL;
-
-            return deltaTotals;
-        }
-
-        Ptr<IConfig const> config() const {
-            return m_config;
-        }
-
-    private: // IResultCapture
-
-        virtual void assertionEnded( AssertionResult const& result ) {
-            if( result.getResultType() == ResultWas::Ok ) {
-                m_totals.assertions.passed++;
-            }
-            else if( !result.isOk() ) {
-                m_totals.assertions.failed++;
-            }
-
-            if( m_reporter->assertionEnded( AssertionStats( result, m_messages, m_totals ) ) )
-                m_messages.clear();
-
-            // Reset working state
-            m_lastAssertionInfo = AssertionInfo( "", m_lastAssertionInfo.lineInfo, "{Unknown expression after the reported line}" , m_lastAssertionInfo.resultDisposition );
-            m_lastResult = result;
-        }
-
-        virtual bool sectionStarted (
-            SectionInfo const& sectionInfo,
-            Counts& assertions
-        )
-        {
-            std::ostringstream oss;
-            oss << sectionInfo.name << "@" << sectionInfo.lineInfo;
-
-            ITracker& sectionTracker = SectionTracker::acquire( m_trackerContext, oss.str() );
-            if( !sectionTracker.isOpen() )
-                return false;
-            m_activeSections.push_back( &sectionTracker );
-
-            m_lastAssertionInfo.lineInfo = sectionInfo.lineInfo;
-
-            m_reporter->sectionStarting( sectionInfo );
-
-            assertions = m_totals.assertions;
-
-            return true;
-        }
-        bool testForMissingAssertions( Counts& assertions ) {
-            if( assertions.total() != 0 )
-                return false;
-            if( !m_config->warnAboutMissingAssertions() )
-                return false;
-            if( m_trackerContext.currentTracker().hasChildren() )
-                return false;
-            m_totals.assertions.failed++;
-            assertions.failed++;
-            return true;
-        }
-
-        virtual void sectionEnded( SectionEndInfo const& endInfo ) {
-            Counts assertions = m_totals.assertions - endInfo.prevAssertions;
-            bool missingAssertions = testForMissingAssertions( assertions );
-
-            if( !m_activeSections.empty() ) {
-                m_activeSections.back()->close();
-                m_activeSections.pop_back();
-            }
-
-            m_reporter->sectionEnded( SectionStats( endInfo.sectionInfo, assertions, endInfo.durationInSeconds, missingAssertions ) );
-            m_messages.clear();
-        }
-
-        virtual void sectionEndedEarly( SectionEndInfo const& endInfo ) {
-            if( m_unfinishedSections.empty() )
-                m_activeSections.back()->fail();
-            else
-                m_activeSections.back()->close();
-            m_activeSections.pop_back();
-
-            m_unfinishedSections.push_back( endInfo );
-        }
-
-        virtual void pushScopedMessage( MessageInfo const& message ) {
-            m_messages.push_back( message );
-        }
-
-        virtual void popScopedMessage( MessageInfo const& message ) {
-            m_messages.erase( std::remove( m_messages.begin(), m_messages.end(), message ), m_messages.end() );
-        }
-
-        virtual std::string getCurrentTestName() const {
-            return m_activeTestCase
-                ? m_activeTestCase->getTestCaseInfo().name
-                : "";
-        }
-
-        virtual const AssertionResult* getLastResult() const {
-            return &m_lastResult;
-        }
-
-        virtual void handleFatalErrorCondition( std::string const& message ) {
-            ResultBuilder resultBuilder = makeUnexpectedResultBuilder();
-            resultBuilder.setResultType( ResultWas::FatalErrorCondition );
-            resultBuilder << message;
-// stack
-#ifdef HAVE_EXECINFO
-            {
-            void *array[15];
-            const int size = static_cast<int>(backtrace(array, 15));
-            char **strings = backtrace_symbols(array, size);
-            for (int i = 0; i < size; i++)
-                resultBuilder << strings[i];
-            free(strings);
-            }
-#endif  // HAVE_EXECINFO
-// stack
-
-            resultBuilder.captureExpression();
-
-            handleUnfinishedSections();
-
-            // Recreate section for test case (as we will lose the one that was in scope)
-            TestCaseInfo const& testCaseInfo = m_activeTestCase->getTestCaseInfo();
-            SectionInfo testCaseSection( testCaseInfo.lineInfo, testCaseInfo.name, testCaseInfo.description );
-
-            Counts assertions;
-            assertions.failed = 1;
-            SectionStats testCaseSectionStats( testCaseSection, assertions, 0, false );
-            m_reporter->sectionEnded( testCaseSectionStats );
-
-            TestCaseInfo testInfo = m_activeTestCase->getTestCaseInfo();
-
-            Totals deltaTotals;
-            deltaTotals.testCases.failed = 1;
-            m_reporter->testCaseEnded( TestCaseStats(   testInfo,
-                                                        deltaTotals,
-                                                        "",
-                                                        "",
-                                                        false ) );
-            m_totals.testCases.failed++;
-            testGroupEnded( "", m_totals, 1, 1 );
-            m_reporter->testRunEnded( TestRunStats( m_runInfo, m_totals, false ) );
-        }
-
-    public:
-        // !TBD We need to do this another way!
-        bool aborting() const {
-            return m_totals.assertions.failed == static_cast<std::size_t>( m_config->abortAfter() );
-        }
-
-    private:
-
-        void runCurrentTest( std::string& redirectedCout, std::string& redirectedCerr ) {
-            TestCaseInfo const& testCaseInfo = m_activeTestCase->getTestCaseInfo();
-            SectionInfo testCaseSection( testCaseInfo.lineInfo, testCaseInfo.name, testCaseInfo.description );
-            m_reporter->sectionStarting( testCaseSection );
-            Counts prevAssertions = m_totals.assertions;
-            double duration = 0;
-            try {
-                m_lastAssertionInfo = AssertionInfo( "TEST_CASE", testCaseInfo.lineInfo, "", ResultDisposition::Normal );
-
-                seedRng( *m_config );
-
-                Timer timer;
-                timer.start();
-                if( m_reporter->getPreferences().shouldRedirectStdOut ) {
-                    StreamRedirect coutRedir( Catch::cout(), redirectedCout );
-                    StreamRedirect cerrRedir( Catch::cerr(), redirectedCerr );
-                    invokeActiveTestCase();
-                }
-                else {
-                    invokeActiveTestCase();
-                }
-                duration = timer.getElapsedSeconds();
-            }
-            catch( TestFailureException& ) {
-                // This just means the test was aborted due to failure
-            }
-            catch(...) {
-                makeUnexpectedResultBuilder().useActiveException();
-            }
-            m_testCaseTracker->close();
-            handleUnfinishedSections();
-            m_messages.clear();
-
-            Counts assertions = m_totals.assertions - prevAssertions;
-            bool missingAssertions = testForMissingAssertions( assertions );
-
-            if( testCaseInfo.okToFail() ) {
-                std::swap( assertions.failedButOk, assertions.failed );
-                m_totals.assertions.failed -= assertions.failedButOk;
-                m_totals.assertions.failedButOk += assertions.failedButOk;
-            }
-
-            SectionStats testCaseSectionStats( testCaseSection, assertions, duration, missingAssertions );
-            m_reporter->sectionEnded( testCaseSectionStats );
-        }
-
-        void invokeActiveTestCase() {
-            FatalConditionHandler fatalConditionHandler; // Handle signals
-            m_activeTestCase->invoke();
-            fatalConditionHandler.reset();
-        }
-
-    private:
-
-        ResultBuilder makeUnexpectedResultBuilder() const {
-            return ResultBuilder(   m_lastAssertionInfo.macroName.c_str(),
-                                    m_lastAssertionInfo.lineInfo,
-                                    m_lastAssertionInfo.capturedExpression.c_str(),
-                                    m_lastAssertionInfo.resultDisposition );
-        }
-
-        void handleUnfinishedSections() {
-            // If sections ended prematurely due to an exception we stored their
-            // infos here so we can tear them down outside the unwind process.
-            for( std::vector<SectionEndInfo>::const_reverse_iterator it = m_unfinishedSections.rbegin(),
-                        itEnd = m_unfinishedSections.rend();
-                    it != itEnd;
-                    ++it )
-                sectionEnded( *it );
-            m_unfinishedSections.clear();
-        }
-
-        TestRunInfo m_runInfo;
-        IMutableContext& m_context;
-        TestCase const* m_activeTestCase;
-        ITracker* m_testCaseTracker;
-        ITracker* m_currentSectionTracker;
-        AssertionResult m_lastResult;
-
-        Ptr<IConfig const> m_config;
-        Totals m_totals;
-        Ptr<IStreamingReporter> m_reporter;
-        std::vector<MessageInfo> m_messages;
-        AssertionInfo m_lastAssertionInfo;
-        std::vector<SectionEndInfo> m_unfinishedSections;
-        std::vector<ITracker*> m_activeSections;
-        TrackerContext m_trackerContext;
-    };
-
-    IResultCapture& getResultCapture() {
-        if( IResultCapture* capture = getCurrentContext().getResultCapture() )
-            return *capture;
-        else
-            throw std::logic_error( "No result capture instance" );
-    }
-
-} // end namespace Catch
-
-// #included from: internal/catch_version.h
-#define TWOBLUECUBES_CATCH_VERSION_H_INCLUDED
-
-namespace Catch {
-
-    // Versioning information
-    struct Version {
-        Version(    unsigned int _majorVersion,
-                    unsigned int _minorVersion,
-                    unsigned int _patchNumber,
-                    std::string const& _branchName,
-                    unsigned int _buildNumber );
-
-        unsigned int const majorVersion;
-        unsigned int const minorVersion;
-        unsigned int const patchNumber;
-
-        // buildNumber is only used if branchName is not null
-        std::string const branchName;
-        unsigned int const buildNumber;
-
-        friend std::ostream& operator << ( std::ostream& os, Version const& version );
-
-    private:
-        void operator=( Version const& );
-    };
-
-    extern Version libraryVersion;
-}
-
-#include <fstream>
-#include <stdlib.h>
-#include <limits>
-
-namespace Catch {
-
-    Ptr<IStreamingReporter> createReporter( std::string const& reporterName, Ptr<Config> const& config ) {
-        Ptr<IStreamingReporter> reporter = getRegistryHub().getReporterRegistry().create( reporterName, config.get() );
-        if( !reporter ) {
-            std::ostringstream oss;
-            oss << "No reporter registered with name: '" << reporterName << "'";
-            throw std::domain_error( oss.str() );
-        }
-        return reporter;
-    }
-
-    Ptr<IStreamingReporter> makeReporter( Ptr<Config> const& config ) {
-        std::vector<std::string> reporters = config->getReporterNames();
-        if( reporters.empty() )
-            reporters.push_back( "console" );
-
-        Ptr<IStreamingReporter> reporter;
-        for( std::vector<std::string>::const_iterator it = reporters.begin(), itEnd = reporters.end();
-                it != itEnd;
-                ++it )
-            reporter = addReporter( reporter, createReporter( *it, config ) );
-        return reporter;
-    }
-    Ptr<IStreamingReporter> addListeners( Ptr<IConfig const> const& config, Ptr<IStreamingReporter> reporters ) {
-        IReporterRegistry::Listeners listeners = getRegistryHub().getReporterRegistry().getListeners();
-        for( IReporterRegistry::Listeners::const_iterator it = listeners.begin(), itEnd = listeners.end();
-                it != itEnd;
-                ++it )
-            reporters = addReporter(reporters, (*it)->create( ReporterConfig( config ) ) );
-        return reporters;
-    }
-
-    Totals runTests( Ptr<Config> const& config ) {
-
-        Ptr<IConfig const> iconfig = config.get();
-
-        Ptr<IStreamingReporter> reporter = makeReporter( config );
-        reporter = addListeners( iconfig, reporter );
-
-        RunContext context( iconfig, reporter );
-
-        Totals totals;
-
-        context.testGroupStarting( config->name(), 1, 1 );
-
-        TestSpec testSpec = config->testSpec();
-        if( !testSpec.hasFilters() )
-            testSpec = TestSpecParser( ITagAliasRegistry::get() ).parse( "~[.]" ).testSpec(); // All not hidden tests
-
-        std::vector<TestCase> const& allTestCases = getAllTestCasesSorted( *iconfig );
-        for( std::vector<TestCase>::const_iterator it = allTestCases.begin(), itEnd = allTestCases.end();
-                it != itEnd;
-                ++it ) {
-            if( !context.aborting() && matchTest( *it, testSpec, *iconfig ) )
-                totals += context.runTest( *it );
-            else
-                reporter->skipTest( *it );
-        }
-
-        context.testGroupEnded( iconfig->name(), totals, 1, 1 );
-        return totals;
-    }
-
-    void applyFilenamesAsTags( IConfig const& config ) {
-        std::vector<TestCase> const& tests = getAllTestCasesSorted( config );
-        for(std::size_t i = 0; i < tests.size(); ++i ) {
-            TestCase& test = const_cast<TestCase&>( tests[i] );
-            std::set<std::string> tags = test.tags;
-
-            std::string filename = test.lineInfo.file;
-            std::string::size_type lastSlash = filename.find_last_of( "\\/" );
-            if( lastSlash != std::string::npos )
-                filename = filename.substr( lastSlash+1 );
-
-            std::string::size_type lastDot = filename.find_last_of( "." );
-            if( lastDot != std::string::npos )
-                filename = filename.substr( 0, lastDot );
-
-            tags.insert( "#" + filename );
-            setTags( test, tags );
-        }
-    }
-
-    class Session : NonCopyable {
-        static bool alreadyInstantiated;
-
-    public:
-
-        struct OnUnusedOptions { enum DoWhat { Ignore, Fail }; };
-
-        Session()
-        : m_cli( makeCommandLineParser() ) {
-            if( alreadyInstantiated ) {
-                std::string msg = "Only one instance of Catch::Session can ever be used";
-                Catch::cerr() << msg << std::endl;
-                throw std::logic_error( msg );
-            }
-            alreadyInstantiated = true;
-        }
-        ~Session() {
-            Catch::cleanUp();
-        }
-
-        void showHelp( std::string const& processName ) {
-            Catch::cout() << "\nCatch v" << libraryVersion << "\n";
-
-            m_cli.usage( Catch::cout(), processName );
-            Catch::cout() << "For more detail usage please see the project docs\n" << std::endl;
-        }
-
-        int applyCommandLine( int argc, char const* const* const argv, OnUnusedOptions::DoWhat unusedOptionBehaviour = OnUnusedOptions::Fail ) {
-            try {
-                m_cli.setThrowOnUnrecognisedTokens( unusedOptionBehaviour == OnUnusedOptions::Fail );
-                m_unusedTokens = m_cli.parseInto( Clara::argsToVector( argc, argv ), m_configData );
-                if( m_configData.showHelp )
-                    showHelp( m_configData.processName );
-                m_config.reset();
-            }
-            catch( std::exception& ex ) {
-                {
-                    Colour colourGuard( Colour::Red );
-                    Catch::cerr()
-                        << "\nError(s) in input:\n"
-                        << Text( ex.what(), TextAttributes().setIndent(2) )
-                        << "\n\n";
-                }
-                m_cli.usage( Catch::cout(), m_configData.processName );
-                return (std::numeric_limits<int>::max)();
-            }
-            return 0;
-        }
-
-        void useConfigData( ConfigData const& _configData ) {
-            m_configData = _configData;
-            m_config.reset();
-        }
-
-        int run( int argc, char const* const* const argv ) {
-
-            int returnCode = applyCommandLine( argc, argv );
-            if( returnCode == 0 )
-                returnCode = run();
-            return returnCode;
-        }
-
-        int run() {
-            if( m_configData.showHelp )
-                return 0;
-
-            try
-            {
-                config(); // Force config to be constructed
-
-                seedRng( *m_config );
-
-                if( m_configData.filenamesAsTags )
-                    applyFilenamesAsTags( *m_config );
-
-                // Handle list request
-                if( Option<std::size_t> listed = list( config() ) )
-                    return static_cast<int>( *listed );
-
-                return static_cast<int>( runTests( m_config ).assertions.failed );
-            }
-            catch( std::exception& ex ) {
-                Catch::cerr() << ex.what() << std::endl;
-                return (std::numeric_limits<int>::max)();
-            }
-        }
-
-        Clara::CommandLine<ConfigData> const& cli() const {
-            return m_cli;
-        }
-        std::vector<Clara::Parser::Token> const& unusedTokens() const {
-            return m_unusedTokens;
-        }
-        ConfigData& configData() {
-            return m_configData;
-        }
-        Config& config() {
-            if( !m_config )
-                m_config = new Config( m_configData );
-            return *m_config;
-        }
-    private:
-        Clara::CommandLine<ConfigData> m_cli;
-        std::vector<Clara::Parser::Token> m_unusedTokens;
-        ConfigData m_configData;
-        Ptr<Config> m_config;
-    };
-
-    bool Session::alreadyInstantiated = false;
-
-} // end namespace Catch
-
-// #included from: catch_registry_hub.hpp
-#define TWOBLUECUBES_CATCH_REGISTRY_HUB_HPP_INCLUDED
-
-// #included from: catch_test_case_registry_impl.hpp
-#define TWOBLUECUBES_CATCH_TEST_CASE_REGISTRY_IMPL_HPP_INCLUDED
-
-#include <vector>
-#include <set>
-#include <sstream>
-#include <iostream>
-#include <algorithm>
-
-namespace Catch {
-
-    struct LexSort {
-        bool operator() (TestCase i,TestCase j) const { return (i<j);}
-    };
-    struct RandomNumberGenerator {
-        int operator()( int n ) const { return std::rand() % n; }
-    };
-
-    inline std::vector<TestCase> sortTests( IConfig const& config, std::vector<TestCase> const& unsortedTestCases ) {
-
-        std::vector<TestCase> sorted = unsortedTestCases;
-
-        switch( config.runOrder() ) {
-            case RunTests::InLexicographicalOrder:
-                std::sort( sorted.begin(), sorted.end(), LexSort() );
-                break;
-            case RunTests::InRandomOrder:
-                {
-                    seedRng( config );
-
-                    RandomNumberGenerator rng;
-                    std::random_shuffle( sorted.begin(), sorted.end(), rng );
-                }
-                break;
-            case RunTests::InDeclarationOrder:
-                // already in declaration order
-                break;
-        }
-        return sorted;
-    }
-    bool matchTest( TestCase const& testCase, TestSpec const& testSpec, IConfig const& config ) {
-        return testSpec.matches( testCase ) && ( config.allowThrows() || !testCase.throws() );
-    }
-
-    void enforceNoDuplicateTestCases( std::vector<TestCase> const& functions ) {
-        std::set<TestCase> seenFunctions;
-        for( std::vector<TestCase>::const_iterator it = functions.begin(), itEnd = functions.end();
-            it != itEnd;
-            ++it ) {
-            std::pair<std::set<TestCase>::const_iterator, bool> prev = seenFunctions.insert( *it );
-            if( !prev.second ){
-                Catch::cerr()
-                << Colour( Colour::Red )
-                << "error: TEST_CASE( \"" << it->name << "\" ) already defined.\n"
-                << "\tFirst seen at " << prev.first->getTestCaseInfo().lineInfo << "\n"
-                << "\tRedefined at " << it->getTestCaseInfo().lineInfo << std::endl;
-                exit(1);
-            }
-        }
-    }
-
-    std::vector<TestCase> filterTests( std::vector<TestCase> const& testCases, TestSpec const& testSpec, IConfig const& config ) {
-        std::vector<TestCase> filtered;
-        filtered.reserve( testCases.size() );
-        for( std::vector<TestCase>::const_iterator it = testCases.begin(), itEnd = testCases.end();
-                it != itEnd;
-                ++it )
-            if( matchTest( *it, testSpec, config ) )
-                filtered.push_back( *it );
-        return filtered;
-    }
-    std::vector<TestCase> const& getAllTestCasesSorted( IConfig const& config ) {
-        return getRegistryHub().getTestCaseRegistry().getAllTestsSorted( config );
-    }
-
-    class TestRegistry : public ITestCaseRegistry {
-    public:
-        TestRegistry()
-        :   m_currentSortOrder( RunTests::InDeclarationOrder ),
-            m_unnamedCount( 0 )
-        {}
-        virtual ~TestRegistry();
-
-        virtual void registerTest( TestCase const& testCase ) {
-            std::string name = testCase.getTestCaseInfo().name;
-            if( name == "" ) {
-                std::ostringstream oss;
-                oss << "Anonymous test case " << ++m_unnamedCount;
-                return registerTest( testCase.withName( oss.str() ) );
-            }
-            m_functions.push_back( testCase );
-        }
-
-        virtual std::vector<TestCase> const& getAllTests() const {
-            return m_functions;
-        }
-        virtual std::vector<TestCase> const& getAllTestsSorted( IConfig const& config ) const {
-            if( m_sortedFunctions.empty() )
-                enforceNoDuplicateTestCases( m_functions );
-
-            if(  m_currentSortOrder != config.runOrder() || m_sortedFunctions.empty() ) {
-                m_sortedFunctions = sortTests( config, m_functions );
-                m_currentSortOrder = config.runOrder();
-            }
-            return m_sortedFunctions;
-        }
-
-    private:
-        std::vector<TestCase> m_functions;
-        mutable RunTests::InWhatOrder m_currentSortOrder;
-        mutable std::vector<TestCase> m_sortedFunctions;
-        size_t m_unnamedCount;
-        std::ios_base::Init m_ostreamInit; // Forces cout/ cerr to be initialised
-    };
-
-    ///////////////////////////////////////////////////////////////////////////
-
-    class FreeFunctionTestCase : public SharedImpl<ITestCase> {
-    public:
-
-        FreeFunctionTestCase( TestFunction fun ) : m_fun( fun ) {}
-
-        virtual void invoke() const {
-            m_fun();
-        }
-
-    private:
-        virtual ~FreeFunctionTestCase();
-
-        TestFunction m_fun;
-    };
-
-    inline std::string extractClassName( std::string const& classOrQualifiedMethodName ) {
-        std::string className = classOrQualifiedMethodName;
-        if( startsWith( className, "&" ) )
-        {
-            std::size_t lastColons = className.rfind( "::" );
-            std::size_t penultimateColons = className.rfind( "::", lastColons-1 );
-            if( penultimateColons == std::string::npos )
-                penultimateColons = 1;
-            className = className.substr( penultimateColons, lastColons-penultimateColons );
-        }
-        return className;
-    }
-
-    void registerTestCase
-        (   ITestCase* testCase,
-            char const* classOrQualifiedMethodName,
-            NameAndDesc const& nameAndDesc,
-            SourceLineInfo const& lineInfo ) {
-
-        getMutableRegistryHub().registerTest
-            ( makeTestCase
-                (   testCase,
-                    extractClassName( classOrQualifiedMethodName ),
-                    nameAndDesc.name,
-                    nameAndDesc.description,
-                    lineInfo ) );
-    }
-    void registerTestCaseFunction
-        (   TestFunction function,
-            SourceLineInfo const& lineInfo,
-            NameAndDesc const& nameAndDesc ) {
-        registerTestCase( new FreeFunctionTestCase( function ), "", nameAndDesc, lineInfo );
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-
-    AutoReg::AutoReg
-        (   TestFunction function,
-            SourceLineInfo const& lineInfo,
-            NameAndDesc const& nameAndDesc ) {
-        registerTestCaseFunction( function, lineInfo, nameAndDesc );
-    }
-
-    AutoReg::~AutoReg() {}
-
-} // end namespace Catch
-
-// #included from: catch_reporter_registry.hpp
-#define TWOBLUECUBES_CATCH_REPORTER_REGISTRY_HPP_INCLUDED
-
-#include <map>
-
-namespace Catch {
-
-    class ReporterRegistry : public IReporterRegistry {
-
-    public:
-
-        virtual ~ReporterRegistry() CATCH_OVERRIDE {}
-
-        virtual IStreamingReporter* create( std::string const& name, Ptr<IConfig const> const& config ) const CATCH_OVERRIDE {
-            FactoryMap::const_iterator it =  m_factories.find( name );
-            if( it == m_factories.end() )
-                return CATCH_NULL;
-            return it->second->create( ReporterConfig( config ) );
-        }
-
-        void registerReporter( std::string const& name, Ptr<IReporterFactory> const& factory ) {
-            m_factories.insert( std::make_pair( name, factory ) );
-        }
-        void registerListener( Ptr<IReporterFactory> const& factory ) {
-            m_listeners.push_back( factory );
-        }
-
-        virtual FactoryMap const& getFactories() const CATCH_OVERRIDE {
-            return m_factories;
-        }
-        virtual Listeners const& getListeners() const CATCH_OVERRIDE {
-            return m_listeners;
-        }
-
-    private:
-        FactoryMap m_factories;
-        Listeners m_listeners;
-    };
-}
-
-// #included from: catch_exception_translator_registry.hpp
-#define TWOBLUECUBES_CATCH_EXCEPTION_TRANSLATOR_REGISTRY_HPP_INCLUDED
-
-#ifdef __OBJC__
-#import "Foundation/Foundation.h"
-#endif
-
-namespace Catch {
-
-    class ExceptionTranslatorRegistry : public IExceptionTranslatorRegistry {
-    public:
-        ~ExceptionTranslatorRegistry() {
-            deleteAll( m_translators );
-        }
-
-        virtual void registerTranslator( const IExceptionTranslator* translator ) {
-            m_translators.push_back( translator );
-        }
-
-        virtual std::string translateActiveException() const {
-            try {
-#ifdef __OBJC__
-                // In Objective-C try objective-c exceptions first
-                @try {
-                    return tryTranslators();
-                }
-                @catch (NSException *exception) {
-                    return Catch::toString( [exception description] );
-                }
-#else
-                return tryTranslators();
-#endif
-            }
-            catch( TestFailureException& ) {
-                throw;
-            }
-            catch( std::exception& ex ) {
-                return ex.what();
-            }
-            catch( std::string& msg ) {
-                return msg;
-            }
-            catch( const char* msg ) {
-                return msg;
-            }
-            catch(...) {
-                return "Unknown exception";
-            }
-        }
-
-        std::string tryTranslators() const {
-            if( m_translators.empty() )
-                throw;
-            else
-                return m_translators[0]->translate( m_translators.begin()+1, m_translators.end() );
-        }
-
-    private:
-        std::vector<const IExceptionTranslator*> m_translators;
-    };
-}
-
-namespace Catch {
-
-    namespace {
-
-        class RegistryHub : public IRegistryHub, public IMutableRegistryHub {
-
-            RegistryHub( RegistryHub const& );
-            void operator=( RegistryHub const& );
-
-        public: // IRegistryHub
-            RegistryHub() {
-            }
-            virtual IReporterRegistry const& getReporterRegistry() const CATCH_OVERRIDE {
-                return m_reporterRegistry;
-            }
-            virtual ITestCaseRegistry const& getTestCaseRegistry() const CATCH_OVERRIDE {
-                return m_testCaseRegistry;
-            }
-            virtual IExceptionTranslatorRegistry& getExceptionTranslatorRegistry() CATCH_OVERRIDE {
-                return m_exceptionTranslatorRegistry;
-            }
-
-        public: // IMutableRegistryHub
-            virtual void registerReporter( std::string const& name, Ptr<IReporterFactory> const& factory ) CATCH_OVERRIDE {
-                m_reporterRegistry.registerReporter( name, factory );
-            }
-            virtual void registerListener( Ptr<IReporterFactory> const& factory ) CATCH_OVERRIDE {
-                m_reporterRegistry.registerListener( factory );
-            }
-            virtual void registerTest( TestCase const& testInfo ) CATCH_OVERRIDE {
-                m_testCaseRegistry.registerTest( testInfo );
-            }
-            virtual void registerTranslator( const IExceptionTranslator* translator ) CATCH_OVERRIDE {
-                m_exceptionTranslatorRegistry.registerTranslator( translator );
-            }
-
-        private:
-            TestRegistry m_testCaseRegistry;
-            ReporterRegistry m_reporterRegistry;
-            ExceptionTranslatorRegistry m_exceptionTranslatorRegistry;
-        };
-
-        // Single, global, instance
-        inline RegistryHub*& getTheRegistryHub() {
-            static RegistryHub* theRegistryHub = CATCH_NULL;
-            if( !theRegistryHub )
-                theRegistryHub = new RegistryHub();
-            return theRegistryHub;
-        }
-    }
-
-    IRegistryHub& getRegistryHub() {
-        return *getTheRegistryHub();
-    }
-    IMutableRegistryHub& getMutableRegistryHub() {
-        return *getTheRegistryHub();
-    }
-    void cleanUp() {
-        delete getTheRegistryHub();
-        getTheRegistryHub() = CATCH_NULL;
-        cleanUpContext();
-    }
-    std::string translateActiveException() {
-        return getRegistryHub().getExceptionTranslatorRegistry().translateActiveException();
-    }
-
-} // end namespace Catch
-
-// #included from: catch_notimplemented_exception.hpp
-#define TWOBLUECUBES_CATCH_NOTIMPLEMENTED_EXCEPTION_HPP_INCLUDED
-
-#include <ostream>
-
-namespace Catch {
-
-    NotImplementedException::NotImplementedException( SourceLineInfo const& lineInfo )
-    :   m_lineInfo( lineInfo ) {
-        std::ostringstream oss;
-        oss << lineInfo << ": function ";
-        oss << "not implemented";
-        m_what = oss.str();
-    }
-
-    const char* NotImplementedException::what() const CATCH_NOEXCEPT {
-        return m_what.c_str();
-    }
-
-} // end namespace Catch
-
-// #included from: catch_context_impl.hpp
-#define TWOBLUECUBES_CATCH_CONTEXT_IMPL_HPP_INCLUDED
-
-// #included from: catch_stream.hpp
-#define TWOBLUECUBES_CATCH_STREAM_HPP_INCLUDED
-
-#include <stdexcept>
-#include <cstdio>
-#include <iostream>
-
-namespace Catch {
-
-    template<typename WriterF, size_t bufferSize=256>
-    class StreamBufImpl : public StreamBufBase {
-        char data[bufferSize];
-        WriterF m_writer;
-
-    public:
-        StreamBufImpl() {
-            setp( data, data + sizeof(data) );
-        }
-
-        ~StreamBufImpl() CATCH_NOEXCEPT {
-            sync();
-        }
-
-    private:
-        int overflow( int c ) {
-            sync();
-
-            if( c != EOF ) {
-                if( pbase() == epptr() )
-                    m_writer( std::string( 1, static_cast<char>( c ) ) );
-                else
-                    sputc( static_cast<char>( c ) );
-            }
-            return 0;
-        }
-
-        int sync() {
-            if( pbase() != pptr() ) {
-                m_writer( std::string( pbase(), static_cast<std::string::size_type>( pptr() - pbase() ) ) );
-                setp( pbase(), epptr() );
-            }
-            return 0;
-        }
-    };
-
-    ///////////////////////////////////////////////////////////////////////////
-
-    FileStream::FileStream( std::string const& filename ) {
-        m_ofs.open( filename.c_str() );
-        if( m_ofs.fail() ) {
-            std::ostringstream oss;
-            oss << "Unable to open file: '" << filename << "'";
-            throw std::domain_error( oss.str() );
-        }
-    }
-
-    std::ostream& FileStream::stream() const {
-        return m_ofs;
-    }
-
-    struct OutputDebugWriter {
-
-        void operator()( std::string const&str ) {
-            writeToDebugConsole( str );
-        }
-    };
-
-    DebugOutStream::DebugOutStream()
-    :   m_streamBuf( new StreamBufImpl<OutputDebugWriter>() ),
-        m_os( m_streamBuf.get() )
-    {}
-
-    std::ostream& DebugOutStream::stream() const {
-        return m_os;
-    }
-
-    // Store the streambuf from cout up-front because
-    // cout may get redirected when running tests
-    CoutStream::CoutStream()
-    :   m_os( Catch::cout().rdbuf() )
-    {}
-
-    std::ostream& CoutStream::stream() const {
-        return m_os;
-    }
-
-#ifndef CATCH_CONFIG_NOSTDOUT // If you #define this you must implement these functions
-    std::ostream& cout() {
-        return std::cout;
-    }
-    std::ostream& cerr() {
-        return std::cerr;
-    }
-#endif
-}
-
-namespace Catch {
-
-    class Context : public IMutableContext {
-
-        Context() : m_config( CATCH_NULL ), m_runner( CATCH_NULL ), m_resultCapture( CATCH_NULL ) {}
-        Context( Context const& );
-        void operator=( Context const& );
-
-    public: // IContext
-        virtual IResultCapture* getResultCapture() {
-            return m_resultCapture;
-        }
-        virtual IRunner* getRunner() {
-            return m_runner;
-        }
-        virtual size_t getGeneratorIndex( std::string const& fileInfo, size_t totalSize ) {
-            return getGeneratorsForCurrentTest()
-            .getGeneratorInfo( fileInfo, totalSize )
-            .getCurrentIndex();
-        }
-        virtual bool advanceGeneratorsForCurrentTest() {
-            IGeneratorsForTest* generators = findGeneratorsForCurrentTest();
-            return generators && generators->moveNext();
-        }
-
-        virtual Ptr<IConfig const> getConfig() const {
-            return m_config;
-        }
-
-    public: // IMutableContext
-        virtual void setResultCapture( IResultCapture* resultCapture ) {
-            m_resultCapture = resultCapture;
-        }
-        virtual void setRunner( IRunner* runner ) {
-            m_runner = runner;
-        }
-        virtual void setConfig( Ptr<IConfig const> const& config ) {
-            m_config = config;
-        }
-
-        friend IMutableContext& getCurrentMutableContext();
-
-    private:
-        IGeneratorsForTest* findGeneratorsForCurrentTest() {
-            std::string testName = getResultCapture()->getCurrentTestName();
-
-            std::map<std::string, IGeneratorsForTest*>::const_iterator it =
-                m_generatorsByTestName.find( testName );
-            return it != m_generatorsByTestName.end()
-                ? it->second
-                : CATCH_NULL;
-        }
-
-        IGeneratorsForTest& getGeneratorsForCurrentTest() {
-            IGeneratorsForTest* generators = findGeneratorsForCurrentTest();
-            if( !generators ) {
-                std::string testName = getResultCapture()->getCurrentTestName();
-                generators = createGeneratorsForTest();
-                m_generatorsByTestName.insert( std::make_pair( testName, generators ) );
-            }
-            return *generators;
-        }
-
-    private:
-        Ptr<IConfig const> m_config;
-        IRunner* m_runner;
-        IResultCapture* m_resultCapture;
-        std::map<std::string, IGeneratorsForTest*> m_generatorsByTestName;
-    };
-
-    namespace {
-        Context* currentContext = CATCH_NULL;
-    }
-    IMutableContext& getCurrentMutableContext() {
-        if( !currentContext )
-            currentContext = new Context();
-        return *currentContext;
-    }
-    IContext& getCurrentContext() {
-        return getCurrentMutableContext();
-    }
-
-    void cleanUpContext() {
-        delete currentContext;
-        currentContext = CATCH_NULL;
-    }
-}
-
-// #included from: catch_console_colour_impl.hpp
-#define TWOBLUECUBES_CATCH_CONSOLE_COLOUR_IMPL_HPP_INCLUDED
-
-namespace Catch {
-    namespace {
-
-        struct IColourImpl {
-            virtual ~IColourImpl() {}
-            virtual void use( Colour::Code _colourCode ) = 0;
-        };
-
-        struct NoColourImpl : IColourImpl {
-            void use( Colour::Code ) {}
-
-            static IColourImpl* instance() {
-                static NoColourImpl s_instance;
-                return &s_instance;
-            }
-        };
-
-    } // anon namespace
-} // namespace Catch
-
-#if !defined( CATCH_CONFIG_COLOUR_NONE ) && !defined( CATCH_CONFIG_COLOUR_WINDOWS ) && !defined( CATCH_CONFIG_COLOUR_ANSI )
-#   ifdef CATCH_PLATFORM_WINDOWS
-#       define CATCH_CONFIG_COLOUR_WINDOWS
-#   else
-#       define CATCH_CONFIG_COLOUR_ANSI
-#   endif
-#endif
-
-#if defined ( CATCH_CONFIG_COLOUR_WINDOWS ) /////////////////////////////////////////
-
-#ifndef NOMINMAX
-#define NOMINMAX
-#endif
-
-#ifdef __AFXDLL
-#include <AfxWin.h>
-#else
-#include <windows.h>
-#endif
-
-namespace Catch {
-namespace {
-
-    class Win32ColourImpl : public IColourImpl {
-    public:
-        Win32ColourImpl() : stdoutHandle( GetStdHandle(STD_OUTPUT_HANDLE) )
-        {
-            CONSOLE_SCREEN_BUFFER_INFO csbiInfo;
-            GetConsoleScreenBufferInfo( stdoutHandle, &csbiInfo );
-            originalForegroundAttributes = csbiInfo.wAttributes & ~( BACKGROUND_GREEN | BACKGROUND_RED | BACKGROUND_BLUE | BACKGROUND_INTENSITY );
-            originalBackgroundAttributes = csbiInfo.wAttributes & ~( FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE | FOREGROUND_INTENSITY );
-        }
-
-        virtual void use( Colour::Code _colourCode ) {
-            switch( _colourCode ) {
-                case Colour::None:      return setTextAttribute( originalForegroundAttributes );
-                case Colour::White:     return setTextAttribute( FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE );
-                case Colour::Red:       return setTextAttribute( FOREGROUND_RED );
-                case Colour::Green:     return setTextAttribute( FOREGROUND_GREEN );
-                case Colour::Blue:      return setTextAttribute( FOREGROUND_BLUE );
-                case Colour::Cyan:      return setTextAttribute( FOREGROUND_BLUE | FOREGROUND_GREEN );
-                case Colour::Yellow:    return setTextAttribute( FOREGROUND_RED | FOREGROUND_GREEN );
-                case Colour::Grey:      return setTextAttribute( 0 );
-
-                case Colour::LightGrey:     return setTextAttribute( FOREGROUND_INTENSITY );
-                case Colour::BrightRed:     return setTextAttribute( FOREGROUND_INTENSITY | FOREGROUND_RED );
-                case Colour::BrightGreen:   return setTextAttribute( FOREGROUND_INTENSITY | FOREGROUND_GREEN );
-                case Colour::BrightWhite:   return setTextAttribute( FOREGROUND_INTENSITY | FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE );
-
-                case Colour::Bright: throw std::logic_error( "not a colour" );
-            }
-        }
-
-    private:
-        void setTextAttribute( WORD _textAttribute ) {
-            SetConsoleTextAttribute( stdoutHandle, _textAttribute | originalBackgroundAttributes );
-        }
-        HANDLE stdoutHandle;
-        WORD originalForegroundAttributes;
-        WORD originalBackgroundAttributes;
-    };
-
-    IColourImpl* platformColourInstance() {
-        static Win32ColourImpl s_instance;
-
-        Ptr<IConfig const> config = getCurrentContext().getConfig();
-        UseColour::YesOrNo colourMode = config
-            ? config->useColour()
-            : UseColour::Auto;
-        if( colourMode == UseColour::Auto )
-            colourMode = !isDebuggerActive()
-                ? UseColour::Yes
-                : UseColour::No;
-        return colourMode == UseColour::Yes
-            ? &s_instance
-            : NoColourImpl::instance();
-    }
-
-} // end anon namespace
-} // end namespace Catch
-
-#elif defined( CATCH_CONFIG_COLOUR_ANSI ) //////////////////////////////////////
-
-#include <unistd.h>
-
-namespace Catch {
-namespace {
-
-    // use POSIX/ ANSI console terminal codes
-    // Thanks to Adam Strzelecki for original contribution
-    // (http://github.com/nanoant)
-    // https://github.com/philsquared/Catch/pull/131
-    class PosixColourImpl : public IColourImpl {
-    public:
-        virtual void use( Colour::Code _colourCode ) {
-            switch( _colourCode ) {
-                case Colour::None:
-                case Colour::White:     return setColour( "[0m" );
-                case Colour::Red:       return setColour( "[0;31m" );
-                case Colour::Green:     return setColour( "[0;32m" );
-                case Colour::Blue:      return setColour( "[0:34m" );
-                case Colour::Cyan:      return setColour( "[0;36m" );
-                case Colour::Yellow:    return setColour( "[0;33m" );
-                case Colour::Grey:      return setColour( "[1;30m" );
-
-                case Colour::LightGrey:     return setColour( "[0;37m" );
-                case Colour::BrightRed:     return setColour( "[1;31m" );
-                case Colour::BrightGreen:   return setColour( "[1;32m" );
-                case Colour::BrightWhite:   return setColour( "[1;37m" );
-
-                case Colour::Bright: throw std::logic_error( "not a colour" );
-            }
-        }
-        static IColourImpl* instance() {
-            static PosixColourImpl s_instance;
-            return &s_instance;
-        }
-
-    private:
-        void setColour( const char* _escapeCode ) {
-            Catch::cout() << '\033' << _escapeCode;
-        }
-    };
-
-    IColourImpl* platformColourInstance() {
-        Ptr<IConfig const> config = getCurrentContext().getConfig();
-        UseColour::YesOrNo colourMode = config
-            ? config->useColour()
-            : UseColour::Auto;
-        if( colourMode == UseColour::Auto )
-            colourMode = (!isDebuggerActive() && isatty(STDOUT_FILENO) )
-                ? UseColour::Yes
-                : UseColour::No;
-        return colourMode == UseColour::Yes
-            ? PosixColourImpl::instance()
-            : NoColourImpl::instance();
-    }
-
-} // end anon namespace
-} // end namespace Catch
-
-#else  // not Windows or ANSI ///////////////////////////////////////////////
-
-namespace Catch {
-
-    static IColourImpl* platformColourInstance() { return NoColourImpl::instance(); }
-
-} // end namespace Catch
-
-#endif // Windows/ ANSI/ None
-
-namespace Catch {
-
-    Colour::Colour( Code _colourCode ) : m_moved( false ) { use( _colourCode ); }
-    Colour::Colour( Colour const& _other ) : m_moved( false ) { const_cast<Colour&>( _other ).m_moved = true; }
-    Colour::~Colour(){ if( !m_moved ) use( None ); }
-
-    void Colour::use( Code _colourCode ) {
-        static IColourImpl* impl = platformColourInstance();
-        impl->use( _colourCode );
-    }
-
-} // end namespace Catch
-
-// #included from: catch_generators_impl.hpp
-#define TWOBLUECUBES_CATCH_GENERATORS_IMPL_HPP_INCLUDED
-
-#include <vector>
-#include <string>
-#include <map>
-
-namespace Catch {
-
-    struct GeneratorInfo : IGeneratorInfo {
-
-        GeneratorInfo( std::size_t size )
-        :   m_size( size ),
-            m_currentIndex( 0 )
-        {}
-
-        bool moveNext() {
-            if( ++m_currentIndex == m_size ) {
-                m_currentIndex = 0;
-                return false;
-            }
-            return true;
-        }
-
-        std::size_t getCurrentIndex() const {
-            return m_currentIndex;
-        }
-
-        std::size_t m_size;
-        std::size_t m_currentIndex;
-    };
-
-    ///////////////////////////////////////////////////////////////////////////
-
-    class GeneratorsForTest : public IGeneratorsForTest {
-
-    public:
-        ~GeneratorsForTest() {
-            deleteAll( m_generatorsInOrder );
-        }
-
-        IGeneratorInfo& getGeneratorInfo( std::string const& fileInfo, std::size_t size ) {
-            std::map<std::string, IGeneratorInfo*>::const_iterator it = m_generatorsByName.find( fileInfo );
-            if( it == m_generatorsByName.end() ) {
-                IGeneratorInfo* info = new GeneratorInfo( size );
-                m_generatorsByName.insert( std::make_pair( fileInfo, info ) );
-                m_generatorsInOrder.push_back( info );
-                return *info;
-            }
-            return *it->second;
-        }
-
-        bool moveNext() {
-            std::vector<IGeneratorInfo*>::const_iterator it = m_generatorsInOrder.begin();
-            std::vector<IGeneratorInfo*>::const_iterator itEnd = m_generatorsInOrder.end();
-            for(; it != itEnd; ++it ) {
-                if( (*it)->moveNext() )
-                    return true;
-            }
-            return false;
-        }
-
-    private:
-        std::map<std::string, IGeneratorInfo*> m_generatorsByName;
-        std::vector<IGeneratorInfo*> m_generatorsInOrder;
-    };
-
-    IGeneratorsForTest* createGeneratorsForTest()
-    {
-        return new GeneratorsForTest();
-    }
-
-} // end namespace Catch
-
-// #included from: catch_assertionresult.hpp
-#define TWOBLUECUBES_CATCH_ASSERTIONRESULT_HPP_INCLUDED
-
-namespace Catch {
-
-    AssertionInfo::AssertionInfo(   std::string const& _macroName,
-                                    SourceLineInfo const& _lineInfo,
-                                    std::string const& _capturedExpression,
-                                    ResultDisposition::Flags _resultDisposition )
-    :   macroName( _macroName ),
-        lineInfo( _lineInfo ),
-        capturedExpression( _capturedExpression ),
-        resultDisposition( _resultDisposition )
-    {}
-
-    AssertionResult::AssertionResult() {}
-
-    AssertionResult::AssertionResult( AssertionInfo const& info, AssertionResultData const& data )
-    :   m_info( info ),
-        m_resultData( data )
-    {}
-
-    AssertionResult::~AssertionResult() {}
-
-    // Result was a success
-    bool AssertionResult::succeeded() const {
-        return Catch::isOk( m_resultData.resultType );
-    }
-
-    // Result was a success, or failure is suppressed
-    bool AssertionResult::isOk() const {
-        return Catch::isOk( m_resultData.resultType ) || shouldSuppressFailure( m_info.resultDisposition );
-    }
-
-    ResultWas::OfType AssertionResult::getResultType() const {
-        return m_resultData.resultType;
-    }
-
-    bool AssertionResult::hasExpression() const {
-        return !m_info.capturedExpression.empty();
-    }
-
-    bool AssertionResult::hasMessage() const {
-        return !m_resultData.message.empty();
-    }
-
-    std::string AssertionResult::getExpression() const {
-        if( isFalseTest( m_info.resultDisposition ) )
-            return "!" + m_info.capturedExpression;
-        else
-            return m_info.capturedExpression;
-    }
-    std::string AssertionResult::getExpressionInMacro() const {
-        if( m_info.macroName.empty() )
-            return m_info.capturedExpression;
-        else
-            return m_info.macroName + "( " + m_info.capturedExpression + " )";
-    }
-
-    bool AssertionResult::hasExpandedExpression() const {
-        return hasExpression() && getExpandedExpression() != getExpression();
-    }
-
-    std::string AssertionResult::getExpandedExpression() const {
-        return m_resultData.reconstructedExpression;
-    }
-
-    std::string AssertionResult::getMessage() const {
-        return m_resultData.message;
-    }
-    SourceLineInfo AssertionResult::getSourceInfo() const {
-        return m_info.lineInfo;
-    }
-
-    std::string AssertionResult::getTestMacroName() const {
-        return m_info.macroName;
-    }
-
-} // end namespace Catch
-
-// #included from: catch_test_case_info.hpp
-#define TWOBLUECUBES_CATCH_TEST_CASE_INFO_HPP_INCLUDED
-
-namespace Catch {
-
-    inline TestCaseInfo::SpecialProperties parseSpecialTag( std::string const& tag ) {
-        if( startsWith( tag, "." ) ||
-            tag == "hide" ||
-            tag == "!hide" )
-            return TestCaseInfo::IsHidden;
-        else if( tag == "!throws" )
-            return TestCaseInfo::Throws;
-        else if( tag == "!shouldfail" )
-            return TestCaseInfo::ShouldFail;
-        else if( tag == "!mayfail" )
-            return TestCaseInfo::MayFail;
-        else
-            return TestCaseInfo::None;
-    }
-    inline bool isReservedTag( std::string const& tag ) {
-        return parseSpecialTag( tag ) == TestCaseInfo::None && tag.size() > 0 && !isalnum( tag[0] );
-    }
-    inline void enforceNotReservedTag( std::string const& tag, SourceLineInfo const& _lineInfo ) {
-        if( isReservedTag( tag ) ) {
-            {
-                Colour colourGuard( Colour::Red );
-                Catch::cerr()
-                    << "Tag name [" << tag << "] not allowed.\n"
-                    << "Tag names starting with non alpha-numeric characters are reserved\n";
-            }
-            {
-                Colour colourGuard( Colour::FileName );
-                Catch::cerr() << _lineInfo << std::endl;
-            }
-            exit(1);
-        }
-    }
-
-    TestCase makeTestCase(  ITestCase* _testCase,
-                            std::string const& _className,
-                            std::string const& _name,
-                            std::string const& _descOrTags,
-                            SourceLineInfo const& _lineInfo )
-    {
-        bool isHidden( startsWith( _name, "./" ) ); // Legacy support
-
-        // Parse out tags
-        std::set<std::string> tags;
-        std::string desc, tag;
-        bool inTag = false;
-        for( std::size_t i = 0; i < _descOrTags.size(); ++i ) {
-            char c = _descOrTags[i];
-            if( !inTag ) {
-                if( c == '[' )
-                    inTag = true;
-                else
-                    desc += c;
-            }
-            else {
-                if( c == ']' ) {
-                    TestCaseInfo::SpecialProperties prop = parseSpecialTag( tag );
-                    if( prop == TestCaseInfo::IsHidden )
-                        isHidden = true;
-                    else if( prop == TestCaseInfo::None )
-                        enforceNotReservedTag( tag, _lineInfo );
-
-                    tags.insert( tag );
-                    tag.clear();
-                    inTag = false;
-                }
-                else
-                    tag += c;
-            }
-        }
-        if( isHidden ) {
-            tags.insert( "hide" );
-            tags.insert( "." );
-        }
-
-        TestCaseInfo info( _name, _className, desc, tags, _lineInfo );
-        return TestCase( _testCase, info );
-    }
-
-    void setTags( TestCaseInfo& testCaseInfo, std::set<std::string> const& tags )
-    {
-        testCaseInfo.tags = tags;
-        testCaseInfo.lcaseTags.clear();
-
-        std::ostringstream oss;
-        for( std::set<std::string>::const_iterator it = tags.begin(), itEnd = tags.end(); it != itEnd; ++it ) {
-            oss << "[" << *it << "]";
-            std::string lcaseTag = toLower( *it );
-            testCaseInfo.properties = static_cast<TestCaseInfo::SpecialProperties>( testCaseInfo.properties | parseSpecialTag( lcaseTag ) );
-            testCaseInfo.lcaseTags.insert( lcaseTag );
-        }
-        testCaseInfo.tagsAsString = oss.str();
-    }
-
-    TestCaseInfo::TestCaseInfo( std::string const& _name,
-                                std::string const& _className,
-                                std::string const& _description,
-                                std::set<std::string> const& _tags,
-                                SourceLineInfo const& _lineInfo )
-    :   name( _name ),
-        className( _className ),
-        description( _description ),
-        lineInfo( _lineInfo ),
-        properties( None )
-    {
-        setTags( *this, _tags );
-    }
-
-    TestCaseInfo::TestCaseInfo( TestCaseInfo const& other )
-    :   name( other.name ),
-        className( other.className ),
-        description( other.description ),
-        tags( other.tags ),
-        lcaseTags( other.lcaseTags ),
-        tagsAsString( other.tagsAsString ),
-        lineInfo( other.lineInfo ),
-        properties( other.properties )
-    {}
-
-    bool TestCaseInfo::isHidden() const {
-        return ( properties & IsHidden ) != 0;
-    }
-    bool TestCaseInfo::throws() const {
-        return ( properties & Throws ) != 0;
-    }
-    bool TestCaseInfo::okToFail() const {
-        return ( properties & (ShouldFail | MayFail ) ) != 0;
-    }
-    bool TestCaseInfo::expectedToFail() const {
-        return ( properties & (ShouldFail ) ) != 0;
-    }
-
-    TestCase::TestCase( ITestCase* testCase, TestCaseInfo const& info ) : TestCaseInfo( info ), test( testCase ) {}
-
-    TestCase::TestCase( TestCase const& other )
-    :   TestCaseInfo( other ),
-        test( other.test )
-    {}
-
-    TestCase TestCase::withName( std::string const& _newName ) const {
-        TestCase other( *this );
-        other.name = _newName;
-        return other;
-    }
-
-    void TestCase::swap( TestCase& other ) {
-        test.swap( other.test );
-        name.swap( other.name );
-        className.swap( other.className );
-        description.swap( other.description );
-        tags.swap( other.tags );
-        lcaseTags.swap( other.lcaseTags );
-        tagsAsString.swap( other.tagsAsString );
-        std::swap( TestCaseInfo::properties, static_cast<TestCaseInfo&>( other ).properties );
-        std::swap( lineInfo, other.lineInfo );
-    }
-
-    void TestCase::invoke() const {
-        test->invoke();
-    }
-
-    bool TestCase::operator == ( TestCase const& other ) const {
-        return  test.get() == other.test.get() &&
-                name == other.name &&
-                className == other.className;
-    }
-
-    bool TestCase::operator < ( TestCase const& other ) const {
-        return name < other.name;
-    }
-    TestCase& TestCase::operator = ( TestCase const& other ) {
-        TestCase temp( other );
-        swap( temp );
-        return *this;
-    }
-
-    TestCaseInfo const& TestCase::getTestCaseInfo() const
-    {
-        return *this;
-    }
-
-} // end namespace Catch
-
-// #included from: catch_version.hpp
-#define TWOBLUECUBES_CATCH_VERSION_HPP_INCLUDED
-
-namespace Catch {
-
-    Version::Version
-        (   unsigned int _majorVersion,
-            unsigned int _minorVersion,
-            unsigned int _patchNumber,
-            std::string const& _branchName,
-            unsigned int _buildNumber )
-    :   majorVersion( _majorVersion ),
-        minorVersion( _minorVersion ),
-        patchNumber( _patchNumber ),
-        branchName( _branchName ),
-        buildNumber( _buildNumber )
-    {}
-
-    std::ostream& operator << ( std::ostream& os, Version const& version ) {
-        os  << version.majorVersion << "."
-            << version.minorVersion << "."
-            << version.patchNumber;
-
-        if( !version.branchName.empty() ) {
-            os  << "-" << version.branchName
-                << "." << version.buildNumber;
-        }
-        return os;
-    }
-
-    Version libraryVersion( 1, 5, 1, "", 0 );
-
-}
-
-// #included from: catch_message.hpp
-#define TWOBLUECUBES_CATCH_MESSAGE_HPP_INCLUDED
-
-namespace Catch {
-
-    MessageInfo::MessageInfo(   std::string const& _macroName,
-                                SourceLineInfo const& _lineInfo,
-                                ResultWas::OfType _type )
-    :   macroName( _macroName ),
-        lineInfo( _lineInfo ),
-        type( _type ),
-        sequence( ++globalCount )
-    {}
-
-    // This may need protecting if threading support is added
-    unsigned int MessageInfo::globalCount = 0;
-
-    ////////////////////////////////////////////////////////////////////////////
-
-    ScopedMessage::ScopedMessage( MessageBuilder const& builder )
-    : m_info( builder.m_info )
-    {
-        m_info.message = builder.m_stream.str();
-        getResultCapture().pushScopedMessage( m_info );
-    }
-    ScopedMessage::ScopedMessage( ScopedMessage const& other )
-    : m_info( other.m_info )
-    {}
-
-    ScopedMessage::~ScopedMessage() {
-        getResultCapture().popScopedMessage( m_info );
-    }
-
-} // end namespace Catch
-
-// #included from: catch_legacy_reporter_adapter.hpp
-#define TWOBLUECUBES_CATCH_LEGACY_REPORTER_ADAPTER_HPP_INCLUDED
-
-// #included from: catch_legacy_reporter_adapter.h
-#define TWOBLUECUBES_CATCH_LEGACY_REPORTER_ADAPTER_H_INCLUDED
-
-namespace Catch
-{
-    // Deprecated
-    struct IReporter : IShared {
-        virtual ~IReporter();
-
-        virtual bool shouldRedirectStdout() const = 0;
-
-        virtual void StartTesting() = 0;
-        virtual void EndTesting( Totals const& totals ) = 0;
-        virtual void StartGroup( std::string const& groupName ) = 0;
-        virtual void EndGroup( std::string const& groupName, Totals const& totals ) = 0;
-        virtual void StartTestCase( TestCaseInfo const& testInfo ) = 0;
-        virtual void EndTestCase( TestCaseInfo const& testInfo, Totals const& totals, std::string const& stdOut, std::string const& stdErr ) = 0;
-        virtual void StartSection( std::string const& sectionName, std::string const& description ) = 0;
-        virtual void EndSection( std::string const& sectionName, Counts const& assertions ) = 0;
-        virtual void NoAssertionsInSection( std::string const& sectionName ) = 0;
-        virtual void NoAssertionsInTestCase( std::string const& testName ) = 0;
-        virtual void Aborted() = 0;
-        virtual void Result( AssertionResult const& result ) = 0;
-    };
-
-    class LegacyReporterAdapter : public SharedImpl<IStreamingReporter>
-    {
-    public:
-        LegacyReporterAdapter( Ptr<IReporter> const& legacyReporter );
-        virtual ~LegacyReporterAdapter();
-
-        virtual ReporterPreferences getPreferences() const;
-        virtual void noMatchingTestCases( std::string const& );
-        virtual void testRunStarting( TestRunInfo const& );
-        virtual void testGroupStarting( GroupInfo const& groupInfo );
-        virtual void testCaseStarting( TestCaseInfo const& testInfo );
-        virtual void sectionStarting( SectionInfo const& sectionInfo );
-        virtual void assertionStarting( AssertionInfo const& );
-        virtual bool assertionEnded( AssertionStats const& assertionStats );
-        virtual void sectionEnded( SectionStats const& sectionStats );
-        virtual void testCaseEnded( TestCaseStats const& testCaseStats );
-        virtual void testGroupEnded( TestGroupStats const& testGroupStats );
-        virtual void testRunEnded( TestRunStats const& testRunStats );
-        virtual void skipTest( TestCaseInfo const& );
-
-    private:
-        Ptr<IReporter> m_legacyReporter;
-    };
-}
-
-namespace Catch
-{
-    LegacyReporterAdapter::LegacyReporterAdapter( Ptr<IReporter> const& legacyReporter )
-    :   m_legacyReporter( legacyReporter )
-    {}
-    LegacyReporterAdapter::~LegacyReporterAdapter() {}
-
-    ReporterPreferences LegacyReporterAdapter::getPreferences() const {
-        ReporterPreferences prefs;
-        prefs.shouldRedirectStdOut = m_legacyReporter->shouldRedirectStdout();
-        return prefs;
-    }
-
-    void LegacyReporterAdapter::noMatchingTestCases( std::string const& ) {}
-    void LegacyReporterAdapter::testRunStarting( TestRunInfo const& ) {
-        m_legacyReporter->StartTesting();
-    }
-    void LegacyReporterAdapter::testGroupStarting( GroupInfo const& groupInfo ) {
-        m_legacyReporter->StartGroup( groupInfo.name );
-    }
-    void LegacyReporterAdapter::testCaseStarting( TestCaseInfo const& testInfo ) {
-        m_legacyReporter->StartTestCase( testInfo );
-    }
-    void LegacyReporterAdapter::sectionStarting( SectionInfo const& sectionInfo ) {
-        m_legacyReporter->StartSection( sectionInfo.name, sectionInfo.description );
-    }
-    void LegacyReporterAdapter::assertionStarting( AssertionInfo const& ) {
-        // Not on legacy interface
-    }
-
-    bool LegacyReporterAdapter::assertionEnded( AssertionStats const& assertionStats ) {
-        if( assertionStats.assertionResult.getResultType() != ResultWas::Ok ) {
-            for( std::vector<MessageInfo>::const_iterator it = assertionStats.infoMessages.begin(), itEnd = assertionStats.infoMessages.end();
-                    it != itEnd;
-                    ++it ) {
-                if( it->type == ResultWas::Info ) {
-                    ResultBuilder rb( it->macroName.c_str(), it->lineInfo, "", ResultDisposition::Normal );
-                    rb << it->message;
-                    rb.setResultType( ResultWas::Info );
-                    AssertionResult result = rb.build();
-                    m_legacyReporter->Result( result );
-                }
-            }
-        }
-        m_legacyReporter->Result( assertionStats.assertionResult );
-        return true;
-    }
-    void LegacyReporterAdapter::sectionEnded( SectionStats const& sectionStats ) {
-        if( sectionStats.missingAssertions )
-            m_legacyReporter->NoAssertionsInSection( sectionStats.sectionInfo.name );
-        m_legacyReporter->EndSection( sectionStats.sectionInfo.name, sectionStats.assertions );
-    }
-    void LegacyReporterAdapter::testCaseEnded( TestCaseStats const& testCaseStats ) {
-        m_legacyReporter->EndTestCase
-            (   testCaseStats.testInfo,
-                testCaseStats.totals,
-                testCaseStats.stdOut,
-                testCaseStats.stdErr );
-    }
-    void LegacyReporterAdapter::testGroupEnded( TestGroupStats const& testGroupStats ) {
-        if( testGroupStats.aborting )
-            m_legacyReporter->Aborted();
-        m_legacyReporter->EndGroup( testGroupStats.groupInfo.name, testGroupStats.totals );
-    }
-    void LegacyReporterAdapter::testRunEnded( TestRunStats const& testRunStats ) {
-        m_legacyReporter->EndTesting( testRunStats.totals );
-    }
-    void LegacyReporterAdapter::skipTest( TestCaseInfo const& ) {
-    }
-}
-
-// #included from: catch_timer.hpp
-
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wc++11-long-long"
-#endif
-
-#ifdef CATCH_PLATFORM_WINDOWS
-#include <windows.h>
-#else
-#include <sys/time.h>
-#endif
-
-namespace Catch {
-
-    namespace {
-#ifdef CATCH_PLATFORM_WINDOWS
-        uint64_t getCurrentTicks() {
-            static uint64_t hz=0, hzo=0;
-            if (!hz) {
-                QueryPerformanceFrequency( reinterpret_cast<LARGE_INTEGER*>( &hz ) );
-                QueryPerformanceCounter( reinterpret_cast<LARGE_INTEGER*>( &hzo ) );
-            }
-            uint64_t t;
-            QueryPerformanceCounter( reinterpret_cast<LARGE_INTEGER*>( &t ) );
-            return ((t-hzo)*1000000)/hz;
-        }
-#else
-        uint64_t getCurrentTicks() {
-            timeval t;
-            gettimeofday(&t,CATCH_NULL);
-            return static_cast<uint64_t>( t.tv_sec ) * 1000000ull + static_cast<uint64_t>( t.tv_usec );
-        }
-#endif
-    }
-
-    void Timer::start() {
-        m_ticks = getCurrentTicks();
-    }
-    unsigned int Timer::getElapsedMicroseconds() const {
-        return static_cast<unsigned int>(getCurrentTicks() - m_ticks);
-    }
-    unsigned int Timer::getElapsedMilliseconds() const {
-        return static_cast<unsigned int>(getElapsedMicroseconds()/1000);
-    }
-    double Timer::getElapsedSeconds() const {
-        return getElapsedMicroseconds()/1000000.0;
-    }
-
-} // namespace Catch
-
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-// #included from: catch_common.hpp
-#define TWOBLUECUBES_CATCH_COMMON_HPP_INCLUDED
-
-namespace Catch {
-
-    bool startsWith( std::string const& s, std::string const& prefix ) {
-        return s.size() >= prefix.size() && s.substr( 0, prefix.size() ) == prefix;
-    }
-    bool endsWith( std::string const& s, std::string const& suffix ) {
-        return s.size() >= suffix.size() && s.substr( s.size()-suffix.size(), suffix.size() ) == suffix;
-    }
-    bool contains( std::string const& s, std::string const& infix ) {
-        return s.find( infix ) != std::string::npos;
-    }
-    void toLowerInPlace( std::string& s ) {
-        std::transform( s.begin(), s.end(), s.begin(), ::tolower );
-    }
-    std::string toLower( std::string const& s ) {
-        std::string lc = s;
-        toLowerInPlace( lc );
-        return lc;
-    }
-    std::string trim( std::string const& str ) {
-        static char const* whitespaceChars = "\n\r\t ";
-        std::string::size_type start = str.find_first_not_of( whitespaceChars );
-        std::string::size_type end = str.find_last_not_of( whitespaceChars );
-
-        return start != std::string::npos ? str.substr( start, 1+end-start ) : "";
-    }
-
-    bool replaceInPlace( std::string& str, std::string const& replaceThis, std::string const& withThis ) {
-        bool replaced = false;
-        std::size_t i = str.find( replaceThis );
-        while( i != std::string::npos ) {
-            replaced = true;
-            str = str.substr( 0, i ) + withThis + str.substr( i+replaceThis.size() );
-            if( i < str.size()-withThis.size() )
-                i = str.find( replaceThis, i+withThis.size() );
-            else
-                i = std::string::npos;
-        }
-        return replaced;
-    }
-
-    pluralise::pluralise( std::size_t count, std::string const& label )
-    :   m_count( count ),
-        m_label( label )
-    {}
-
-    std::ostream& operator << ( std::ostream& os, pluralise const& pluraliser ) {
-        os << pluraliser.m_count << " " << pluraliser.m_label;
-        if( pluraliser.m_count != 1 )
-            os << "s";
-        return os;
-    }
-
-    SourceLineInfo::SourceLineInfo() : line( 0 ){}
-    SourceLineInfo::SourceLineInfo( char const* _file, std::size_t _line )
-    :   file( _file ),
-        line( _line )
-    {}
-    SourceLineInfo::SourceLineInfo( SourceLineInfo const& other )
-    :   file( other.file ),
-        line( other.line )
-    {}
-    bool SourceLineInfo::empty() const {
-        return file.empty();
-    }
-    bool SourceLineInfo::operator == ( SourceLineInfo const& other ) const {
-        return line == other.line && file == other.file;
-    }
-    bool SourceLineInfo::operator < ( SourceLineInfo const& other ) const {
-        return line < other.line || ( line == other.line  && file < other.file );
-    }
-
-    void seedRng( IConfig const& config ) {
-        if( config.rngSeed() != 0 )
-            std::srand( config.rngSeed() );
-    }
-    unsigned int rngSeed() {
-        return getCurrentContext().getConfig()->rngSeed();
-    }
-
-    std::ostream& operator << ( std::ostream& os, SourceLineInfo const& info ) {
-#ifndef __GNUG__
-        os << info.file << "(" << info.line << ")";
-#else
-        os << info.file << ":" << info.line;
-#endif
-        return os;
-    }
-
-    void throwLogicError( std::string const& message, SourceLineInfo const& locationInfo ) {
-        std::ostringstream oss;
-        oss << locationInfo << ": Internal Catch error: '" << message << "'";
-        if( alwaysTrue() )
-            throw std::logic_error( oss.str() );
-    }
-}
-
-// #included from: catch_section.hpp
-#define TWOBLUECUBES_CATCH_SECTION_HPP_INCLUDED
-
-namespace Catch {
-
-    SectionInfo::SectionInfo
-        (   SourceLineInfo const& _lineInfo,
-            std::string const& _name,
-            std::string const& _description )
-    :   name( _name ),
-        description( _description ),
-        lineInfo( _lineInfo )
-    {}
-
-    Section::Section( SectionInfo const& info )
-    :   m_info( info ),
-        m_sectionIncluded( getResultCapture().sectionStarted( m_info, m_assertions ) )
-    {
-        m_timer.start();
-    }
-
-    Section::~Section() {
-        if( m_sectionIncluded ) {
-            SectionEndInfo endInfo( m_info, m_assertions, m_timer.getElapsedSeconds() );
-            if( std::uncaught_exception() )
-                getResultCapture().sectionEndedEarly( endInfo );
-            else
-                getResultCapture().sectionEnded( endInfo );
-        }
-    }
-
-    // This indicates whether the section should be executed or not
-    Section::operator bool() const {
-        return m_sectionIncluded;
-    }
-
-} // end namespace Catch
-
-// #included from: catch_debugger.hpp
-#define TWOBLUECUBES_CATCH_DEBUGGER_HPP_INCLUDED
-
-#include <iostream>
-
-#ifdef CATCH_PLATFORM_MAC
-
-    #include <assert.h>
-    #include <stdbool.h>
-    #include <sys/types.h>
-    #include <unistd.h>
-    #include <sys/sysctl.h>
-
-    namespace Catch{
-
-        // The following function is taken directly from the following technical note:
-        // http://developer.apple.com/library/mac/#qa/qa2004/qa1361.html
-
-        // Returns true if the current process is being debugged (either
-        // running under the debugger or has a debugger attached post facto).
-        bool isDebuggerActive(){
-
-            int                 mib[4];
-            struct kinfo_proc   info;
-            size_t              size;
-
-            // Initialize the flags so that, if sysctl fails for some bizarre
-            // reason, we get a predictable result.
-
-            info.kp_proc.p_flag = 0;
-
-            // Initialize mib, which tells sysctl the info we want, in this case
-            // we're looking for information about a specific process ID.
-
-            mib[0] = CTL_KERN;
-            mib[1] = KERN_PROC;
-            mib[2] = KERN_PROC_PID;
-            mib[3] = getpid();
-
-            // Call sysctl.
-
-            size = sizeof(info);
-            if( sysctl(mib, sizeof(mib) / sizeof(*mib), &info, &size, CATCH_NULL, 0) != 0 ) {
-                Catch::cerr() << "\n** Call to sysctl failed - unable to determine if debugger is active **\n" << std::endl;
-                return false;
-            }
-
-            // We're being debugged if the P_TRACED flag is set.
-
-            return ( (info.kp_proc.p_flag & P_TRACED) != 0 );
-        }
-    } // namespace Catch
-
-#elif defined(_MSC_VER)
-    extern "C" __declspec(dllimport) int __stdcall IsDebuggerPresent();
-    namespace Catch {
-        bool isDebuggerActive() {
-            return IsDebuggerPresent() != 0;
-        }
-    }
-#elif defined(__MINGW32__)
-    extern "C" __declspec(dllimport) int __stdcall IsDebuggerPresent();
-    namespace Catch {
-        bool isDebuggerActive() {
-            return IsDebuggerPresent() != 0;
-        }
-    }
-#else
-    namespace Catch {
-       inline bool isDebuggerActive() { return false; }
-    }
-#endif // Platform
-
-#ifdef CATCH_PLATFORM_WINDOWS
-    extern "C" __declspec(dllimport) void __stdcall OutputDebugStringA( const char* );
-    namespace Catch {
-        void writeToDebugConsole( std::string const& text ) {
-            ::OutputDebugStringA( text.c_str() );
-        }
-    }
-#else
-    namespace Catch {
-        void writeToDebugConsole( std::string const& text ) {
-            // !TBD: Need a version for Mac/ XCode and other IDEs
-            Catch::cout() << text;
-        }
-    }
-#endif // Platform
-
-// #included from: catch_tostring.hpp
-#define TWOBLUECUBES_CATCH_TOSTRING_HPP_INCLUDED
-
-namespace Catch {
-
-namespace Detail {
-
-    const std::string unprintableString = "{?}";
-
-    namespace {
-        const int hexThreshold = 255;
-
-        struct Endianness {
-            enum Arch { Big, Little };
-
-            static Arch which() {
-                union _{
-                    int asInt;
-                    char asChar[sizeof (int)];
-                } u;
-
-                u.asInt = 1;
-                return ( u.asChar[sizeof(int)-1] == 1 ) ? Big : Little;
-            }
-        };
-    }
-
-    std::string rawMemoryToString( const void *object, std::size_t size )
-    {
-        // Reverse order for little endian architectures
-        int i = 0, end = static_cast<int>( size ), inc = 1;
-        if( Endianness::which() == Endianness::Little ) {
-            i = end-1;
-            end = inc = -1;
-        }
-
-        unsigned char const *bytes = static_cast<unsigned char const *>(object);
-        std::ostringstream os;
-        os << "0x" << std::setfill('0') << std::hex;
-        for( ; i != end; i += inc )
-             os << std::setw(2) << static_cast<unsigned>(bytes[i]);
-       return os.str();
-    }
-}
-
-std::string toString( std::string const& value ) {
-    std::string s = value;
-    if( getCurrentContext().getConfig()->showInvisibles() ) {
-        for(size_t i = 0; i < s.size(); ++i ) {
-            std::string subs;
-            switch( s[i] ) {
-            case '\n': subs = "\\n"; break;
-            case '\t': subs = "\\t"; break;
-            default: break;
-            }
-            if( !subs.empty() ) {
-                s = s.substr( 0, i ) + subs + s.substr( i+1 );
-                ++i;
-            }
-        }
-    }
-    return "\"" + s + "\"";
-}
-std::string toString( std::wstring const& value ) {
-
-    std::string s;
-    s.reserve( value.size() );
-    for(size_t i = 0; i < value.size(); ++i )
-        s += value[i] <= 0xff ? static_cast<char>( value[i] ) : '?';
-    return Catch::toString( s );
-}
-
-std::string toString( const char* const value ) {
-    return value ? Catch::toString( std::string( value ) ) : std::string( "{null string}" );
-}
-
-std::string toString( char* const value ) {
-    return Catch::toString( static_cast<const char*>( value ) );
-}
-
-std::string toString( const wchar_t* const value )
-{
-	return value ? Catch::toString( std::wstring(value) ) : std::string( "{null string}" );
-}
-
-std::string toString( wchar_t* const value )
-{
-	return Catch::toString( static_cast<const wchar_t*>( value ) );
-}
-
-std::string toString( int value ) {
-    std::ostringstream oss;
-    oss << value;
-    if( value > Detail::hexThreshold )
-        oss << " (0x" << std::hex << value << ")";
-    return oss.str();
-}
-
-std::string toString( unsigned long value ) {
-    std::ostringstream oss;
-    oss << value;
-    if( value > Detail::hexThreshold )
-        oss << " (0x" << std::hex << value << ")";
-    return oss.str();
-}
-
-std::string toString( unsigned int value ) {
-    return Catch::toString( static_cast<unsigned long>( value ) );
-}
-
-template<typename T>
-std::string fpToString( T value, int precision ) {
-    std::ostringstream oss;
-    oss << std::setprecision( precision )
-        << std::fixed
-        << value;
-    std::string d = oss.str();
-    std::size_t i = d.find_last_not_of( '0' );
-    if( i != std::string::npos && i != d.size()-1 ) {
-        if( d[i] == '.' )
-            i++;
-        d = d.substr( 0, i+1 );
-    }
-    return d;
-}
-
-std::string toString( const double value ) {
-    return fpToString( value, 10 );
-}
-std::string toString( const float value ) {
-    return fpToString( value, 5 ) + "f";
-}
-
-std::string toString( bool value ) {
-    return value ? "true" : "false";
-}
-
-std::string toString( char value ) {
-    return value < ' '
-        ? toString( static_cast<unsigned int>( value ) )
-        : Detail::makeString( value );
-}
-
-std::string toString( signed char value ) {
-    return toString( static_cast<char>( value ) );
-}
-
-std::string toString( unsigned char value ) {
-    return toString( static_cast<char>( value ) );
-}
-
-#ifdef CATCH_CONFIG_CPP11_LONG_LONG
-std::string toString( long long value ) {
-    std::ostringstream oss;
-    oss << value;
-    if( value > Detail::hexThreshold )
-        oss << " (0x" << std::hex << value << ")";
-    return oss.str();
-}
-std::string toString( unsigned long long value ) {
-    std::ostringstream oss;
-    oss << value;
-    if( value > Detail::hexThreshold )
-        oss << " (0x" << std::hex << value << ")";
-    return oss.str();
-}
-#endif
-
-#ifdef CATCH_CONFIG_CPP11_NULLPTR
-std::string toString( std::nullptr_t ) {
-    return "nullptr";
-}
-#endif
-
-#ifdef __OBJC__
-    std::string toString( NSString const * const& nsstring ) {
-        if( !nsstring )
-            return "nil";
-        return "@" + toString([nsstring UTF8String]);
-    }
-    std::string toString( NSString * CATCH_ARC_STRONG const& nsstring ) {
-        if( !nsstring )
-            return "nil";
-        return "@" + toString([nsstring UTF8String]);
-    }
-    std::string toString( NSObject* const& nsObject ) {
-        return toString( [nsObject description] );
-    }
-#endif
-
-} // end namespace Catch
-
-// #included from: catch_result_builder.hpp
-#define TWOBLUECUBES_CATCH_RESULT_BUILDER_HPP_INCLUDED
-
-namespace Catch {
-
-    std::string capturedExpressionWithSecondArgument( std::string const& capturedExpression, std::string const& secondArg ) {
-        return secondArg.empty() || secondArg == "\"\""
-            ? capturedExpression
-            : capturedExpression + ", " + secondArg;
-    }
-    ResultBuilder::ResultBuilder(   char const* macroName,
-                                    SourceLineInfo const& lineInfo,
-                                    char const* capturedExpression,
-                                    ResultDisposition::Flags resultDisposition,
-                                    char const* secondArg )
-    :   m_assertionInfo( macroName, lineInfo, capturedExpressionWithSecondArgument( capturedExpression, secondArg ), resultDisposition ),
-        m_shouldDebugBreak( false ),
-        m_shouldThrow( false )
-    {}
-
-    ResultBuilder& ResultBuilder::setResultType( ResultWas::OfType result ) {
-        m_data.resultType = result;
-        return *this;
-    }
-    ResultBuilder& ResultBuilder::setResultType( bool result ) {
-        m_data.resultType = result ? ResultWas::Ok : ResultWas::ExpressionFailed;
-        return *this;
-    }
-    ResultBuilder& ResultBuilder::setLhs( std::string const& lhs ) {
-        m_exprComponents.lhs = lhs;
-        return *this;
-    }
-    ResultBuilder& ResultBuilder::setRhs( std::string const& rhs ) {
-        m_exprComponents.rhs = rhs;
-        return *this;
-    }
-    ResultBuilder& ResultBuilder::setOp( std::string const& op ) {
-        m_exprComponents.op = op;
-        return *this;
-    }
-
-    void ResultBuilder::endExpression() {
-        m_exprComponents.testFalse = isFalseTest( m_assertionInfo.resultDisposition );
-        captureExpression();
-    }
-
-    void ResultBuilder::useActiveException( ResultDisposition::Flags resultDisposition ) {
-        m_assertionInfo.resultDisposition = resultDisposition;
-        m_stream.oss << Catch::translateActiveException();
-        captureResult( ResultWas::ThrewException );
-    }
-
-    void ResultBuilder::captureResult( ResultWas::OfType resultType ) {
-        setResultType( resultType );
-        captureExpression();
-    }
-    void ResultBuilder::captureExpectedException( std::string const& expectedMessage ) {
-        if( expectedMessage.empty() )
-            captureExpectedException( Matchers::Impl::Generic::AllOf<std::string>() );
-        else
-            captureExpectedException( Matchers::Equals( expectedMessage ) );
-    }
-
-    void ResultBuilder::captureExpectedException( Matchers::Impl::Matcher<std::string> const& matcher ) {
-
-        assert( m_exprComponents.testFalse == false );
-        AssertionResultData data = m_data;
-        data.resultType = ResultWas::Ok;
-        data.reconstructedExpression = m_assertionInfo.capturedExpression;
-
-        std::string actualMessage = Catch::translateActiveException();
-        if( !matcher.match( actualMessage ) ) {
-            data.resultType = ResultWas::ExpressionFailed;
-            data.reconstructedExpression = actualMessage;
-        }
-        AssertionResult result( m_assertionInfo, data );
-        handleResult( result );
-    }
-
-    void ResultBuilder::captureExpression() {
-        AssertionResult result = build();
-        handleResult( result );
-    }
-    void ResultBuilder::handleResult( AssertionResult const& result )
-    {
-        getResultCapture().assertionEnded( result );
-
-        if( !result.isOk() ) {
-            if( getCurrentContext().getConfig()->shouldDebugBreak() )
-                m_shouldDebugBreak = true;
-            if( getCurrentContext().getRunner()->aborting() || (m_assertionInfo.resultDisposition & ResultDisposition::Normal) )
-                m_shouldThrow = true;
-        }
-    }
-    void ResultBuilder::react() {
-        if( m_shouldThrow )
-            throw Catch::TestFailureException();
-    }
-
-    bool ResultBuilder::shouldDebugBreak() const { return m_shouldDebugBreak; }
-    bool ResultBuilder::allowThrows() const { return getCurrentContext().getConfig()->allowThrows(); }
-
-    AssertionResult ResultBuilder::build() const
-    {
-        assert( m_data.resultType != ResultWas::Unknown );
-
-        AssertionResultData data = m_data;
-
-        // Flip bool results if testFalse is set
-        if( m_exprComponents.testFalse ) {
-            if( data.resultType == ResultWas::Ok )
-                data.resultType = ResultWas::ExpressionFailed;
-            else if( data.resultType == ResultWas::ExpressionFailed )
-                data.resultType = ResultWas::Ok;
-        }
-
-        data.message = m_stream.oss.str();
-        data.reconstructedExpression = reconstructExpression();
-        if( m_exprComponents.testFalse ) {
-            if( m_exprComponents.op == "" )
-                data.reconstructedExpression = "!" + data.reconstructedExpression;
-            else
-                data.reconstructedExpression = "!(" + data.reconstructedExpression + ")";
-        }
-        return AssertionResult( m_assertionInfo, data );
-    }
-    std::string ResultBuilder::reconstructExpression() const {
-        if( m_exprComponents.op == "" )
-            return m_exprComponents.lhs.empty() ? m_assertionInfo.capturedExpression : m_exprComponents.op + m_exprComponents.lhs;
-        else if( m_exprComponents.op == "matches" )
-            return m_exprComponents.lhs + " " + m_exprComponents.rhs;
-        else if( m_exprComponents.op != "!" ) {
-            if( m_exprComponents.lhs.size() + m_exprComponents.rhs.size() < 40 &&
-                m_exprComponents.lhs.find("\n") == std::string::npos &&
-                m_exprComponents.rhs.find("\n") == std::string::npos )
-                return m_exprComponents.lhs + " " + m_exprComponents.op + " " + m_exprComponents.rhs;
-            else
-                return m_exprComponents.lhs + "\n" + m_exprComponents.op + "\n" + m_exprComponents.rhs;
-        }
-        else
-            return "{can't expand - use " + m_assertionInfo.macroName + "_FALSE( " + m_assertionInfo.capturedExpression.substr(1) + " ) instead of " + m_assertionInfo.macroName + "( " + m_assertionInfo.capturedExpression + " ) for better diagnostics}";
-    }
-
-} // end namespace Catch
-
-// #included from: catch_tag_alias_registry.hpp
-#define TWOBLUECUBES_CATCH_TAG_ALIAS_REGISTRY_HPP_INCLUDED
-
-// #included from: catch_tag_alias_registry.h
-#define TWOBLUECUBES_CATCH_TAG_ALIAS_REGISTRY_H_INCLUDED
-
-#include <map>
-
-namespace Catch {
-
-    class TagAliasRegistry : public ITagAliasRegistry {
-    public:
-        virtual ~TagAliasRegistry();
-        virtual Option<TagAlias> find( std::string const& alias ) const;
-        virtual std::string expandAliases( std::string const& unexpandedTestSpec ) const;
-        void add( char const* alias, char const* tag, SourceLineInfo const& lineInfo );
-        static TagAliasRegistry& get();
-
-    private:
-        std::map<std::string, TagAlias> m_registry;
-    };
-
-} // end namespace Catch
-
-#include <map>
-#include <iostream>
-
-namespace Catch {
-
-    TagAliasRegistry::~TagAliasRegistry() {}
-
-    Option<TagAlias> TagAliasRegistry::find( std::string const& alias ) const {
-        std::map<std::string, TagAlias>::const_iterator it = m_registry.find( alias );
-        if( it != m_registry.end() )
-            return it->second;
-        else
-            return Option<TagAlias>();
-    }
-
-    std::string TagAliasRegistry::expandAliases( std::string const& unexpandedTestSpec ) const {
-        std::string expandedTestSpec = unexpandedTestSpec;
-        for( std::map<std::string, TagAlias>::const_iterator it = m_registry.begin(), itEnd = m_registry.end();
-                it != itEnd;
-                ++it ) {
-            std::size_t pos = expandedTestSpec.find( it->first );
-            if( pos != std::string::npos ) {
-                expandedTestSpec =  expandedTestSpec.substr( 0, pos ) +
-                                    it->second.tag +
-                                    expandedTestSpec.substr( pos + it->first.size() );
-            }
-        }
-        return expandedTestSpec;
-    }
-
-    void TagAliasRegistry::add( char const* alias, char const* tag, SourceLineInfo const& lineInfo ) {
-
-        if( !startsWith( alias, "[@" ) || !endsWith( alias, "]" ) ) {
-            std::ostringstream oss;
-            oss << "error: tag alias, \"" << alias << "\" is not of the form [@alias name].\n" << lineInfo;
-            throw std::domain_error( oss.str().c_str() );
-        }
-        if( !m_registry.insert( std::make_pair( alias, TagAlias( tag, lineInfo ) ) ).second ) {
-            std::ostringstream oss;
-            oss << "error: tag alias, \"" << alias << "\" already registered.\n"
-                << "\tFirst seen at " << find(alias)->lineInfo << "\n"
-                << "\tRedefined at " << lineInfo;
-            throw std::domain_error( oss.str().c_str() );
-        }
-    }
-
-    TagAliasRegistry& TagAliasRegistry::get() {
-        static TagAliasRegistry instance;
-        return instance;
-
-    }
-
-    ITagAliasRegistry::~ITagAliasRegistry() {}
-    ITagAliasRegistry const& ITagAliasRegistry::get() { return TagAliasRegistry::get(); }
-
-    RegistrarForTagAliases::RegistrarForTagAliases( char const* alias, char const* tag, SourceLineInfo const& lineInfo ) {
-        try {
-            TagAliasRegistry::get().add( alias, tag, lineInfo );
-        }
-        catch( std::exception& ex ) {
-            Colour colourGuard( Colour::Red );
-            Catch::cerr() << ex.what() << std::endl;
-            exit(1);
-        }
-    }
-
-} // end namespace Catch
-
-// #included from: ../reporters/catch_reporter_multi.hpp
-#define TWOBLUECUBES_CATCH_REPORTER_MULTI_HPP_INCLUDED
-
-namespace Catch {
-
-class MultipleReporters : public SharedImpl<IStreamingReporter> {
-    typedef std::vector<Ptr<IStreamingReporter> > Reporters;
-    Reporters m_reporters;
-
-public:
-    void add( Ptr<IStreamingReporter> const& reporter ) {
-        m_reporters.push_back( reporter );
-    }
-
-public: // IStreamingReporter
-
-    virtual ReporterPreferences getPreferences() const CATCH_OVERRIDE {
-        return m_reporters[0]->getPreferences();
-    }
-
-    virtual void noMatchingTestCases( std::string const& spec ) CATCH_OVERRIDE {
-        for( Reporters::const_iterator it = m_reporters.begin(), itEnd = m_reporters.end();
-                it != itEnd;
-                ++it )
-            (*it)->noMatchingTestCases( spec );
-    }
-
-    virtual void testRunStarting( TestRunInfo const& testRunInfo ) CATCH_OVERRIDE {
-        for( Reporters::const_iterator it = m_reporters.begin(), itEnd = m_reporters.end();
-                it != itEnd;
-                ++it )
-            (*it)->testRunStarting( testRunInfo );
-    }
-
-    virtual void testGroupStarting( GroupInfo const& groupInfo ) CATCH_OVERRIDE {
-        for( Reporters::const_iterator it = m_reporters.begin(), itEnd = m_reporters.end();
-                it != itEnd;
-                ++it )
-            (*it)->testGroupStarting( groupInfo );
-    }
-
-    virtual void testCaseStarting( TestCaseInfo const& testInfo ) CATCH_OVERRIDE {
-        for( Reporters::const_iterator it = m_reporters.begin(), itEnd = m_reporters.end();
-                it != itEnd;
-                ++it )
-            (*it)->testCaseStarting( testInfo );
-    }
-
-    virtual void sectionStarting( SectionInfo const& sectionInfo ) CATCH_OVERRIDE {
-        for( Reporters::const_iterator it = m_reporters.begin(), itEnd = m_reporters.end();
-                it != itEnd;
-                ++it )
-            (*it)->sectionStarting( sectionInfo );
-    }
-
-    virtual void assertionStarting( AssertionInfo const& assertionInfo ) CATCH_OVERRIDE {
-        for( Reporters::const_iterator it = m_reporters.begin(), itEnd = m_reporters.end();
-                it != itEnd;
-                ++it )
-            (*it)->assertionStarting( assertionInfo );
-    }
-
-    // The return value indicates if the messages buffer should be cleared:
-    virtual bool assertionEnded( AssertionStats const& assertionStats ) CATCH_OVERRIDE {
-        bool clearBuffer = false;
-        for( Reporters::const_iterator it = m_reporters.begin(), itEnd = m_reporters.end();
-                it != itEnd;
-                ++it )
-            clearBuffer |= (*it)->assertionEnded( assertionStats );
-        return clearBuffer;
-    }
-
-    virtual void sectionEnded( SectionStats const& sectionStats ) CATCH_OVERRIDE {
-        for( Reporters::const_iterator it = m_reporters.begin(), itEnd = m_reporters.end();
-                it != itEnd;
-                ++it )
-            (*it)->sectionEnded( sectionStats );
-    }
-
-    virtual void testCaseEnded( TestCaseStats const& testCaseStats ) CATCH_OVERRIDE {
-        for( Reporters::const_iterator it = m_reporters.begin(), itEnd = m_reporters.end();
-                it != itEnd;
-                ++it )
-            (*it)->testCaseEnded( testCaseStats );
-    }
-
-    virtual void testGroupEnded( TestGroupStats const& testGroupStats ) CATCH_OVERRIDE {
-        for( Reporters::const_iterator it = m_reporters.begin(), itEnd = m_reporters.end();
-                it != itEnd;
-                ++it )
-            (*it)->testGroupEnded( testGroupStats );
-    }
-
-    virtual void testRunEnded( TestRunStats const& testRunStats ) CATCH_OVERRIDE {
-        for( Reporters::const_iterator it = m_reporters.begin(), itEnd = m_reporters.end();
-                it != itEnd;
-                ++it )
-            (*it)->testRunEnded( testRunStats );
-    }
-
-    virtual void skipTest( TestCaseInfo const& testInfo ) CATCH_OVERRIDE {
-        for( Reporters::const_iterator it = m_reporters.begin(), itEnd = m_reporters.end();
-                it != itEnd;
-                ++it )
-            (*it)->skipTest( testInfo );
-    }
-
-    virtual MultipleReporters* tryAsMulti() CATCH_OVERRIDE {
-        return this;
-    }
-
-};
-
-Ptr<IStreamingReporter> addReporter( Ptr<IStreamingReporter> const& existingReporter, Ptr<IStreamingReporter> const& additionalReporter ) {
-    Ptr<IStreamingReporter> resultingReporter;
-
-    if( existingReporter ) {
-        MultipleReporters* multi = existingReporter->tryAsMulti();
-        if( !multi ) {
-            multi = new MultipleReporters;
-            resultingReporter = Ptr<IStreamingReporter>( multi );
-            if( existingReporter )
-                multi->add( existingReporter );
-        }
-        else
-            resultingReporter = existingReporter;
-        multi->add( additionalReporter );
-    }
-    else
-        resultingReporter = additionalReporter;
-
-    return resultingReporter;
-}
-
-} // end namespace Catch
-
-// #included from: ../reporters/catch_reporter_xml.hpp
-#define TWOBLUECUBES_CATCH_REPORTER_XML_HPP_INCLUDED
-
-// #included from: catch_reporter_bases.hpp
-#define TWOBLUECUBES_CATCH_REPORTER_BASES_HPP_INCLUDED
-
-#include <cstring>
-
-namespace Catch {
-
-    struct StreamingReporterBase : SharedImpl<IStreamingReporter> {
-
-        StreamingReporterBase( ReporterConfig const& _config )
-        :   m_config( _config.fullConfig() ),
-            stream( _config.stream() )
-        {
-            m_reporterPrefs.shouldRedirectStdOut = false;
-        }
-
-        virtual ReporterPreferences getPreferences() const CATCH_OVERRIDE {
-            return m_reporterPrefs;
-        }
-
-        virtual ~StreamingReporterBase() CATCH_OVERRIDE;
-
-        virtual void noMatchingTestCases( std::string const& ) CATCH_OVERRIDE {}
-
-        virtual void testRunStarting( TestRunInfo const& _testRunInfo ) CATCH_OVERRIDE {
-            currentTestRunInfo = _testRunInfo;
-        }
-        virtual void testGroupStarting( GroupInfo const& _groupInfo ) CATCH_OVERRIDE {
-            currentGroupInfo = _groupInfo;
-        }
-
-        virtual void testCaseStarting( TestCaseInfo const& _testInfo ) CATCH_OVERRIDE {
-            currentTestCaseInfo = _testInfo;
-        }
-        virtual void sectionStarting( SectionInfo const& _sectionInfo ) CATCH_OVERRIDE {
-            m_sectionStack.push_back( _sectionInfo );
-        }
-
-        virtual void sectionEnded( SectionStats const& /* _sectionStats */ ) CATCH_OVERRIDE {
-            m_sectionStack.pop_back();
-        }
-        virtual void testCaseEnded( TestCaseStats const& /* _testCaseStats */ ) CATCH_OVERRIDE {
-            currentTestCaseInfo.reset();
-        }
-        virtual void testGroupEnded( TestGroupStats const& /* _testGroupStats */ ) CATCH_OVERRIDE {
-            currentGroupInfo.reset();
-        }
-        virtual void testRunEnded( TestRunStats const& /* _testRunStats */ ) CATCH_OVERRIDE {
-            currentTestCaseInfo.reset();
-            currentGroupInfo.reset();
-            currentTestRunInfo.reset();
-        }
-
-        virtual void skipTest( TestCaseInfo const& ) CATCH_OVERRIDE {
-            // Don't do anything with this by default.
-            // It can optionally be overridden in the derived class.
-        }
-
-        Ptr<IConfig const> m_config;
-        std::ostream& stream;
-
-        LazyStat<TestRunInfo> currentTestRunInfo;
-        LazyStat<GroupInfo> currentGroupInfo;
-        LazyStat<TestCaseInfo> currentTestCaseInfo;
-
-        std::vector<SectionInfo> m_sectionStack;
-        ReporterPreferences m_reporterPrefs;
-    };
-
-    struct CumulativeReporterBase : SharedImpl<IStreamingReporter> {
-        template<typename T, typename ChildNodeT>
-        struct Node : SharedImpl<> {
-            explicit Node( T const& _value ) : value( _value ) {}
-            virtual ~Node() {}
-
-            typedef std::vector<Ptr<ChildNodeT> > ChildNodes;
-            T value;
-            ChildNodes children;
-        };
-        struct SectionNode : SharedImpl<> {
-            explicit SectionNode( SectionStats const& _stats ) : stats( _stats ) {}
-            virtual ~SectionNode();
-
-            bool operator == ( SectionNode const& other ) const {
-                return stats.sectionInfo.lineInfo == other.stats.sectionInfo.lineInfo;
-            }
-            bool operator == ( Ptr<SectionNode> const& other ) const {
-                return operator==( *other );
-            }
-
-            SectionStats stats;
-            typedef std::vector<Ptr<SectionNode> > ChildSections;
-            typedef std::vector<AssertionStats> Assertions;
-            ChildSections childSections;
-            Assertions assertions;
-            std::string stdOut;
-            std::string stdErr;
-        };
-
-        struct BySectionInfo {
-            BySectionInfo( SectionInfo const& other ) : m_other( other ) {}
-			BySectionInfo( BySectionInfo const& other ) : m_other( other.m_other ) {}
-            bool operator() ( Ptr<SectionNode> const& node ) const {
-                return node->stats.sectionInfo.lineInfo == m_other.lineInfo;
-            }
-        private:
-			void operator=( BySectionInfo const& );
-            SectionInfo const& m_other;
-        };
-
-        typedef Node<TestCaseStats, SectionNode> TestCaseNode;
-        typedef Node<TestGroupStats, TestCaseNode> TestGroupNode;
-        typedef Node<TestRunStats, TestGroupNode> TestRunNode;
-
-        CumulativeReporterBase( ReporterConfig const& _config )
-        :   m_config( _config.fullConfig() ),
-            stream( _config.stream() )
-        {
-            m_reporterPrefs.shouldRedirectStdOut = false;
-        }
-        ~CumulativeReporterBase();
-
-        virtual ReporterPreferences getPreferences() const CATCH_OVERRIDE {
-            return m_reporterPrefs;
-        }
-
-        virtual void testRunStarting( TestRunInfo const& ) CATCH_OVERRIDE {}
-        virtual void testGroupStarting( GroupInfo const& ) CATCH_OVERRIDE {}
-
-        virtual void testCaseStarting( TestCaseInfo const& ) CATCH_OVERRIDE {}
-
-        virtual void sectionStarting( SectionInfo const& sectionInfo ) CATCH_OVERRIDE {
-            SectionStats incompleteStats( sectionInfo, Counts(), 0, false );
-            Ptr<SectionNode> node;
-            if( m_sectionStack.empty() ) {
-                if( !m_rootSection )
-                    m_rootSection = new SectionNode( incompleteStats );
-                node = m_rootSection;
-            }
-            else {
-                SectionNode& parentNode = *m_sectionStack.back();
-                SectionNode::ChildSections::const_iterator it =
-                    std::find_if(   parentNode.childSections.begin(),
-                                    parentNode.childSections.end(),
-                                    BySectionInfo( sectionInfo ) );
-                if( it == parentNode.childSections.end() ) {
-                    node = new SectionNode( incompleteStats );
-                    parentNode.childSections.push_back( node );
-                }
-                else
-                    node = *it;
-            }
-            m_sectionStack.push_back( node );
-            m_deepestSection = node;
-        }
-
-        virtual void assertionStarting( AssertionInfo const& ) CATCH_OVERRIDE {}
-
-        virtual bool assertionEnded( AssertionStats const& assertionStats ) CATCH_OVERRIDE {
-            assert( !m_sectionStack.empty() );
-            SectionNode& sectionNode = *m_sectionStack.back();
-            sectionNode.assertions.push_back( assertionStats );
-            return true;
-        }
-        virtual void sectionEnded( SectionStats const& sectionStats ) CATCH_OVERRIDE {
-            assert( !m_sectionStack.empty() );
-            SectionNode& node = *m_sectionStack.back();
-            node.stats = sectionStats;
-            m_sectionStack.pop_back();
-        }
-        virtual void testCaseEnded( TestCaseStats const& testCaseStats ) CATCH_OVERRIDE {
-            Ptr<TestCaseNode> node = new TestCaseNode( testCaseStats );
-            assert( m_sectionStack.size() == 0 );
-            node->children.push_back( m_rootSection );
-            m_testCases.push_back( node );
-            m_rootSection.reset();
-
-            assert( m_deepestSection );
-            m_deepestSection->stdOut = testCaseStats.stdOut;
-            m_deepestSection->stdErr = testCaseStats.stdErr;
-        }
-        virtual void testGroupEnded( TestGroupStats const& testGroupStats ) CATCH_OVERRIDE {
-            Ptr<TestGroupNode> node = new TestGroupNode( testGroupStats );
-            node->children.swap( m_testCases );
-            m_testGroups.push_back( node );
-        }
-        virtual void testRunEnded( TestRunStats const& testRunStats ) CATCH_OVERRIDE {
-            Ptr<TestRunNode> node = new TestRunNode( testRunStats );
-            node->children.swap( m_testGroups );
-            m_testRuns.push_back( node );
-            testRunEndedCumulative();
-        }
-        virtual void testRunEndedCumulative() = 0;
-
-        virtual void skipTest( TestCaseInfo const& ) CATCH_OVERRIDE {}
-
-        Ptr<IConfig const> m_config;
-        std::ostream& stream;
-        std::vector<AssertionStats> m_assertions;
-        std::vector<std::vector<Ptr<SectionNode> > > m_sections;
-        std::vector<Ptr<TestCaseNode> > m_testCases;
-        std::vector<Ptr<TestGroupNode> > m_testGroups;
-
-        std::vector<Ptr<TestRunNode> > m_testRuns;
-
-        Ptr<SectionNode> m_rootSection;
-        Ptr<SectionNode> m_deepestSection;
-        std::vector<Ptr<SectionNode> > m_sectionStack;
-        ReporterPreferences m_reporterPrefs;
-
-    };
-
-    template<char C>
-    char const* getLineOfChars() {
-        static char line[CATCH_CONFIG_CONSOLE_WIDTH] = {0};
-        if( !*line ) {
-            memset( line, C, CATCH_CONFIG_CONSOLE_WIDTH-1 );
-            line[CATCH_CONFIG_CONSOLE_WIDTH-1] = 0;
-        }
-        return line;
-    }
-
-    struct TestEventListenerBase : StreamingReporterBase {
-        TestEventListenerBase( ReporterConfig const& _config )
-        :   StreamingReporterBase( _config )
-        {}
-
-        virtual void assertionStarting( AssertionInfo const& ) CATCH_OVERRIDE {}
-        virtual bool assertionEnded( AssertionStats const& ) CATCH_OVERRIDE {
-            return false;
-        }
-    };
-
-} // end namespace Catch
-
-// #included from: ../internal/catch_reporter_registrars.hpp
-#define TWOBLUECUBES_CATCH_REPORTER_REGISTRARS_HPP_INCLUDED
-
-namespace Catch {
-
-    template<typename T>
-    class LegacyReporterRegistrar {
-
-        class ReporterFactory : public IReporterFactory {
-            virtual IStreamingReporter* create( ReporterConfig const& config ) const {
-                return new LegacyReporterAdapter( new T( config ) );
-            }
-
-            virtual std::string getDescription() const {
-                return T::getDescription();
-            }
-        };
-
-    public:
-
-        LegacyReporterRegistrar( std::string const& name ) {
-            getMutableRegistryHub().registerReporter( name, new ReporterFactory() );
-        }
-    };
-
-    template<typename T>
-    class ReporterRegistrar {
-
-        class ReporterFactory : public SharedImpl<IReporterFactory> {
-
-            // *** Please Note ***:
-            // - If you end up here looking at a compiler error because it's trying to register
-            // your custom reporter class be aware that the native reporter interface has changed
-            // to IStreamingReporter. The "legacy" interface, IReporter, is still supported via
-            // an adapter. Just use REGISTER_LEGACY_REPORTER to take advantage of the adapter.
-            // However please consider updating to the new interface as the old one is now
-            // deprecated and will probably be removed quite soon!
-            // Please contact me via github if you have any questions at all about this.
-            // In fact, ideally, please contact me anyway to let me know you've hit this - as I have
-            // no idea who is actually using custom reporters at all (possibly no-one!).
-            // The new interface is designed to minimise exposure to interface changes in the future.
-            virtual IStreamingReporter* create( ReporterConfig const& config ) const {
-                return new T( config );
-            }
-
-            virtual std::string getDescription() const {
-                return T::getDescription();
-            }
-        };
-
-    public:
-
-        ReporterRegistrar( std::string const& name ) {
-            getMutableRegistryHub().registerReporter( name, new ReporterFactory() );
-        }
-    };
-
-    template<typename T>
-    class ListenerRegistrar {
-
-        class ListenerFactory : public SharedImpl<IReporterFactory> {
-
-            virtual IStreamingReporter* create( ReporterConfig const& config ) const {
-                return new T( config );
-            }
-            virtual std::string getDescription() const {
-                return "";
-            }
-        };
-
-    public:
-
-        ListenerRegistrar() {
-            getMutableRegistryHub().registerListener( new ListenerFactory() );
-        }
-    };
-}
-
-#define INTERNAL_CATCH_REGISTER_LEGACY_REPORTER( name, reporterType ) \
-    namespace{ Catch::LegacyReporterRegistrar<reporterType> catch_internal_RegistrarFor##reporterType( name ); }
-
-#define INTERNAL_CATCH_REGISTER_REPORTER( name, reporterType ) \
-    namespace{ Catch::ReporterRegistrar<reporterType> catch_internal_RegistrarFor##reporterType( name ); }
-
-#define INTERNAL_CATCH_REGISTER_LISTENER( listenerType ) \
-    namespace{ Catch::ListenerRegistrar<listenerType> catch_internal_RegistrarFor##listenerType; }
-
-// #included from: ../internal/catch_xmlwriter.hpp
-#define TWOBLUECUBES_CATCH_XMLWRITER_HPP_INCLUDED
-
-#include <sstream>
-#include <string>
-#include <vector>
-#include <iomanip>
-
-namespace Catch {
-
-    class XmlEncode {
-    public:
-        enum ForWhat { ForTextNodes, ForAttributes };
-
-        XmlEncode( std::string const& str, ForWhat forWhat = ForTextNodes )
-        :   m_str( str ),
-            m_forWhat( forWhat )
-        {}
-
-        void encodeTo( std::ostream& os ) const {
-
-            // Apostrophe escaping not necessary if we always use " to write attributes
-            // (see: http://www.w3.org/TR/xml/#syntax)
-
-            for( std::size_t i = 0; i < m_str.size(); ++ i ) {
-                char c = m_str[i];
-                switch( c ) {
-                    case '<':   os << "&lt;"; break;
-                    case '&':   os << "&amp;"; break;
-
-                    case '>':
-                        // See: http://www.w3.org/TR/xml/#syntax
-                        if( i > 2 && m_str[i-1] == ']' && m_str[i-2] == ']' )
-                            os << "&gt;";
-                        else
-                            os << c;
-                        break;
-
-                    case '\"':
-                        if( m_forWhat == ForAttributes )
-                            os << "&quot;";
-                        else
-                            os << c;
-                        break;
-
-                    default:
-                        // Escape control chars - based on contribution by @espenalb in PR #465
-                        if ( ( c < '\x09' ) || ( c > '\x0D' && c < '\x20') || c=='\x7F' )
-                            os << "&#x" << std::uppercase << std::hex << static_cast<int>( c );
-                        else
-                            os << c;
-                }
-            }
-        }
-
-        friend std::ostream& operator << ( std::ostream& os, XmlEncode const& xmlEncode ) {
-            xmlEncode.encodeTo( os );
-            return os;
-        }
-
-    private:
-        std::string m_str;
-        ForWhat m_forWhat;
-    };
-
-    class XmlWriter {
-    public:
-
-        class ScopedElement {
-        public:
-            ScopedElement( XmlWriter* writer )
-            :   m_writer( writer )
-            {}
-
-            ScopedElement( ScopedElement const& other )
-            :   m_writer( other.m_writer ){
-                other.m_writer = CATCH_NULL;
-            }
-
-            ~ScopedElement() {
-                if( m_writer )
-                    m_writer->endElement();
-            }
-
-            ScopedElement& writeText( std::string const& text, bool indent = true ) {
-                m_writer->writeText( text, indent );
-                return *this;
-            }
-
-            template<typename T>
-            ScopedElement& writeAttribute( std::string const& name, T const& attribute ) {
-                m_writer->writeAttribute( name, attribute );
-                return *this;
-            }
-
-        private:
-            mutable XmlWriter* m_writer;
-        };
-
-        XmlWriter()
-        :   m_tagIsOpen( false ),
-            m_needsNewline( false ),
-            m_os( &Catch::cout() )
-        {}
-
-        XmlWriter( std::ostream& os )
-        :   m_tagIsOpen( false ),
-            m_needsNewline( false ),
-            m_os( &os )
-        {}
-
-        ~XmlWriter() {
-            while( !m_tags.empty() )
-                endElement();
-        }
-
-        XmlWriter& startElement( std::string const& name ) {
-            ensureTagClosed();
-            newlineIfNecessary();
-            stream() << m_indent << "<" << name;
-            m_tags.push_back( name );
-            m_indent += "  ";
-            m_tagIsOpen = true;
-            return *this;
-        }
-
-        ScopedElement scopedElement( std::string const& name ) {
-            ScopedElement scoped( this );
-            startElement( name );
-            return scoped;
-        }
-
-        XmlWriter& endElement() {
-            newlineIfNecessary();
-            m_indent = m_indent.substr( 0, m_indent.size()-2 );
-            if( m_tagIsOpen ) {
-                stream() << "/>\n";
-                m_tagIsOpen = false;
-            }
-            else {
-                stream() << m_indent << "</" << m_tags.back() << ">\n";
-            }
-            m_tags.pop_back();
-            return *this;
-        }
-
-        XmlWriter& writeAttribute( std::string const& name, std::string const& attribute ) {
-            if( !name.empty() && !attribute.empty() )
-                stream() << " " << name << "=\"" << XmlEncode( attribute, XmlEncode::ForAttributes ) << "\"";
-            return *this;
-        }
-
-        XmlWriter& writeAttribute( std::string const& name, bool attribute ) {
-            stream() << " " << name << "=\"" << ( attribute ? "true" : "false" ) << "\"";
-            return *this;
-        }
-
-        template<typename T>
-        XmlWriter& writeAttribute( std::string const& name, T const& attribute ) {
-            std::ostringstream oss;
-            oss << attribute;
-            return writeAttribute( name, oss.str() );
-        }
-
-        XmlWriter& writeText( std::string const& text, bool indent = true ) {
-            if( !text.empty() ){
-                bool tagWasOpen = m_tagIsOpen;
-                ensureTagClosed();
-                if( tagWasOpen && indent )
-                    stream() << m_indent;
-                stream() << XmlEncode( text );
-                m_needsNewline = true;
-            }
-            return *this;
-        }
-
-        XmlWriter& writeComment( std::string const& text ) {
-            ensureTagClosed();
-            stream() << m_indent << "<!--" << text << "-->";
-            m_needsNewline = true;
-            return *this;
-        }
-
-        XmlWriter& writeBlankLine() {
-            ensureTagClosed();
-            stream() << "\n";
-            return *this;
-        }
-
-        void setStream( std::ostream& os ) {
-            m_os = &os;
-        }
-
-    private:
-        XmlWriter( XmlWriter const& );
-        void operator=( XmlWriter const& );
-
-        std::ostream& stream() {
-            return *m_os;
-        }
-
-        void ensureTagClosed() {
-            if( m_tagIsOpen ) {
-                stream() << ">\n";
-                m_tagIsOpen = false;
-            }
-        }
-
-        void newlineIfNecessary() {
-            if( m_needsNewline ) {
-                stream() << "\n";
-                m_needsNewline = false;
-            }
-        }
-
-        bool m_tagIsOpen;
-        bool m_needsNewline;
-        std::vector<std::string> m_tags;
-        std::string m_indent;
-        std::ostream* m_os;
-    };
-
-}
-// #included from: catch_reenable_warnings.h
-
-#define TWOBLUECUBES_CATCH_REENABLE_WARNINGS_H_INCLUDED
-
-#ifdef __clang__
-#    ifdef __ICC // icpc defines the __clang__ macro
-#        pragma warning(pop)
-#    else
-#        pragma clang diagnostic pop
-#    endif
-#elif defined __GNUC__
-#    pragma GCC diagnostic pop
-#endif
-
-
-namespace Catch {
-    class XmlReporter : public StreamingReporterBase {
-    public:
-        XmlReporter( ReporterConfig const& _config )
-        :   StreamingReporterBase( _config ),
-            m_sectionDepth( 0 )
-        {
-            m_reporterPrefs.shouldRedirectStdOut = true;
-        }
-
-        virtual ~XmlReporter() CATCH_OVERRIDE;
-
-        static std::string getDescription() {
-            return "Reports test results as an XML document";
-        }
-
-    public: // StreamingReporterBase
-
-        virtual void noMatchingTestCases( std::string const& s ) CATCH_OVERRIDE {
-            StreamingReporterBase::noMatchingTestCases( s );
-        }
-
-        virtual void testRunStarting( TestRunInfo const& testInfo ) CATCH_OVERRIDE {
-            StreamingReporterBase::testRunStarting( testInfo );
-            m_xml.setStream( stream );
-            m_xml.startElement( "Catch" );
-            if( !m_config->name().empty() )
-                m_xml.writeAttribute( "name", m_config->name() );
-        }
-
-        virtual void testGroupStarting( GroupInfo const& groupInfo ) CATCH_OVERRIDE {
-            StreamingReporterBase::testGroupStarting( groupInfo );
-            m_xml.startElement( "Group" )
-                .writeAttribute( "name", groupInfo.name );
-        }
-
-        virtual void testCaseStarting( TestCaseInfo const& testInfo ) CATCH_OVERRIDE {
-            StreamingReporterBase::testCaseStarting(testInfo);
-            m_xml.startElement( "TestCase" ).writeAttribute( "name", trim( testInfo.name ) );
-
-            if ( m_config->showDurations() == ShowDurations::Always )
-                m_testCaseTimer.start();
-        }
-
-        virtual void sectionStarting( SectionInfo const& sectionInfo ) CATCH_OVERRIDE {
-            StreamingReporterBase::sectionStarting( sectionInfo );
-            if( m_sectionDepth++ > 0 ) {
-                m_xml.startElement( "Section" )
-                    .writeAttribute( "name", trim( sectionInfo.name ) )
-                    .writeAttribute( "description", sectionInfo.description );
-            }
-        }
-
-        virtual void assertionStarting( AssertionInfo const& ) CATCH_OVERRIDE { }
-
-        virtual bool assertionEnded( AssertionStats const& assertionStats ) CATCH_OVERRIDE {
-            const AssertionResult& assertionResult = assertionStats.assertionResult;
-
-            // Print any info messages in <Info> tags.
-            if( assertionStats.assertionResult.getResultType() != ResultWas::Ok ) {
-                for( std::vector<MessageInfo>::const_iterator it = assertionStats.infoMessages.begin(), itEnd = assertionStats.infoMessages.end();
-                        it != itEnd;
-                        ++it ) {
-                    if( it->type == ResultWas::Info ) {
-                        m_xml.scopedElement( "Info" )
-                            .writeText( it->message );
-                    } else if ( it->type == ResultWas::Warning ) {
-                        m_xml.scopedElement( "Warning" )
-                            .writeText( it->message );
-                    }
-                }
-            }
-
-            // Drop out if result was successful but we're not printing them.
-            if( !m_config->includeSuccessfulResults() && isOk(assertionResult.getResultType()) )
-                return true;
-
-            // Print the expression if there is one.
-            if( assertionResult.hasExpression() ) {
-                m_xml.startElement( "Expression" )
-                    .writeAttribute( "success", assertionResult.succeeded() )
-					.writeAttribute( "type", assertionResult.getTestMacroName() )
-                    .writeAttribute( "filename", assertionResult.getSourceInfo().file )
-                    .writeAttribute( "line", assertionResult.getSourceInfo().line );
-
-                m_xml.scopedElement( "Original" )
-                    .writeText( assertionResult.getExpression() );
-                m_xml.scopedElement( "Expanded" )
-                    .writeText( assertionResult.getExpandedExpression() );
-            }
-
-            // And... Print a result applicable to each result type.
-            switch( assertionResult.getResultType() ) {
-                case ResultWas::ThrewException:
-                    m_xml.scopedElement( "Exception" )
-                        .writeAttribute( "filename", assertionResult.getSourceInfo().file )
-                        .writeAttribute( "line", assertionResult.getSourceInfo().line )
-                        .writeText( assertionResult.getMessage() );
-                    break;
-                case ResultWas::FatalErrorCondition:
-                    m_xml.scopedElement( "Fatal Error Condition" )
-                        .writeAttribute( "filename", assertionResult.getSourceInfo().file )
-                        .writeAttribute( "line", assertionResult.getSourceInfo().line )
-                        .writeText( assertionResult.getMessage() );
-                    break;
-                case ResultWas::Info:
-                    m_xml.scopedElement( "Info" )
-                        .writeText( assertionResult.getMessage() );
-                    break;
-                case ResultWas::Warning:
-                    // Warning will already have been written
-                    break;
-                case ResultWas::ExplicitFailure:
-                    m_xml.scopedElement( "Failure" )
-                        .writeText( assertionResult.getMessage() );
-                    break;
-                default:
-                    break;
-            }
-
-            if( assertionResult.hasExpression() )
-                m_xml.endElement();
-
-            return true;
-        }
-
-        virtual void sectionEnded( SectionStats const& sectionStats ) CATCH_OVERRIDE {
-            StreamingReporterBase::sectionEnded( sectionStats );
-            if( --m_sectionDepth > 0 ) {
-                XmlWriter::ScopedElement e = m_xml.scopedElement( "OverallResults" );
-                e.writeAttribute( "successes", sectionStats.assertions.passed );
-                e.writeAttribute( "failures", sectionStats.assertions.failed );
-                e.writeAttribute( "expectedFailures", sectionStats.assertions.failedButOk );
-
-                if ( m_config->showDurations() == ShowDurations::Always )
-                    e.writeAttribute( "durationInSeconds", sectionStats.durationInSeconds );
-
-                m_xml.endElement();
-            }
-        }
-
-        virtual void testCaseEnded( TestCaseStats const& testCaseStats ) CATCH_OVERRIDE {
-            StreamingReporterBase::testCaseEnded( testCaseStats );
-            XmlWriter::ScopedElement e = m_xml.scopedElement( "OverallResult" );
-            e.writeAttribute( "success", testCaseStats.totals.assertions.allOk() );
-
-            if ( m_config->showDurations() == ShowDurations::Always )
-                e.writeAttribute( "durationInSeconds", m_testCaseTimer.getElapsedSeconds() );
-
-            m_xml.endElement();
-        }
-
-        virtual void testGroupEnded( TestGroupStats const& testGroupStats ) CATCH_OVERRIDE {
-            StreamingReporterBase::testGroupEnded( testGroupStats );
-            // TODO: Check testGroupStats.aborting and act accordingly.
-            m_xml.scopedElement( "OverallResults" )
-                .writeAttribute( "successes", testGroupStats.totals.assertions.passed )
-                .writeAttribute( "failures", testGroupStats.totals.assertions.failed )
-                .writeAttribute( "expectedFailures", testGroupStats.totals.assertions.failedButOk );
-            m_xml.endElement();
-        }
-
-        virtual void testRunEnded( TestRunStats const& testRunStats ) CATCH_OVERRIDE {
-            StreamingReporterBase::testRunEnded( testRunStats );
-            m_xml.scopedElement( "OverallResults" )
-                .writeAttribute( "successes", testRunStats.totals.assertions.passed )
-                .writeAttribute( "failures", testRunStats.totals.assertions.failed )
-                .writeAttribute( "expectedFailures", testRunStats.totals.assertions.failedButOk );
-            m_xml.endElement();
-        }
-
-    private:
-        Timer m_testCaseTimer;
-        XmlWriter m_xml;
-        int m_sectionDepth;
-    };
-
-     INTERNAL_CATCH_REGISTER_REPORTER( "xml", XmlReporter )
-
-} // end namespace Catch
-
-// #included from: ../reporters/catch_reporter_junit.hpp
-#define TWOBLUECUBES_CATCH_REPORTER_JUNIT_HPP_INCLUDED
-
-#include <assert.h>
-
-namespace Catch {
-
-    class JunitReporter : public CumulativeReporterBase {
-    public:
-        JunitReporter( ReporterConfig const& _config )
-        :   CumulativeReporterBase( _config ),
-            xml( _config.stream() )
-        {
-            m_reporterPrefs.shouldRedirectStdOut = true;
-        }
-
-        virtual ~JunitReporter() CATCH_OVERRIDE;
-
-        static std::string getDescription() {
-            return "Reports test results in an XML format that looks like Ant's junitreport target";
-        }
-
-        virtual void noMatchingTestCases( std::string const& /*spec*/ ) CATCH_OVERRIDE {}
-
-        virtual void testRunStarting( TestRunInfo const& runInfo ) CATCH_OVERRIDE {
-            CumulativeReporterBase::testRunStarting( runInfo );
-            xml.startElement( "testsuites" );
-        }
-
-        virtual void testGroupStarting( GroupInfo const& groupInfo ) CATCH_OVERRIDE {
-            suiteTimer.start();
-            stdOutForSuite.str("");
-            stdErrForSuite.str("");
-            unexpectedExceptions = 0;
-            CumulativeReporterBase::testGroupStarting( groupInfo );
-        }
-
-        virtual bool assertionEnded( AssertionStats const& assertionStats ) CATCH_OVERRIDE {
-            if( assertionStats.assertionResult.getResultType() == ResultWas::ThrewException )
-                unexpectedExceptions++;
-            return CumulativeReporterBase::assertionEnded( assertionStats );
-        }
-
-        virtual void testCaseEnded( TestCaseStats const& testCaseStats ) CATCH_OVERRIDE {
-            stdOutForSuite << testCaseStats.stdOut;
-            stdErrForSuite << testCaseStats.stdErr;
-            CumulativeReporterBase::testCaseEnded( testCaseStats );
-        }
-
-        virtual void testGroupEnded( TestGroupStats const& testGroupStats ) CATCH_OVERRIDE {
-            double suiteTime = suiteTimer.getElapsedSeconds();
-            CumulativeReporterBase::testGroupEnded( testGroupStats );
-            writeGroup( *m_testGroups.back(), suiteTime );
-        }
-
-        virtual void testRunEndedCumulative() CATCH_OVERRIDE {
-            xml.endElement();
-        }
-
-        void writeGroup( TestGroupNode const& groupNode, double suiteTime ) {
-            XmlWriter::ScopedElement e = xml.scopedElement( "testsuite" );
-            TestGroupStats const& stats = groupNode.value;
-            xml.writeAttribute( "name", stats.groupInfo.name );
-            xml.writeAttribute( "errors", unexpectedExceptions );
-            xml.writeAttribute( "failures", stats.totals.assertions.failed-unexpectedExceptions );
-            xml.writeAttribute( "tests", stats.totals.assertions.total() );
-            xml.writeAttribute( "hostname", "tbd" ); // !TBD
-            if( m_config->showDurations() == ShowDurations::Never )
-                xml.writeAttribute( "time", "" );
-            else
-                xml.writeAttribute( "time", suiteTime );
-            xml.writeAttribute( "timestamp", "tbd" ); // !TBD
-
-            // Write test cases
-            for( TestGroupNode::ChildNodes::const_iterator
-                    it = groupNode.children.begin(), itEnd = groupNode.children.end();
-                    it != itEnd;
-                    ++it )
-                writeTestCase( **it );
-
-            xml.scopedElement( "system-out" ).writeText( trim( stdOutForSuite.str() ), false );
-            xml.scopedElement( "system-err" ).writeText( trim( stdErrForSuite.str() ), false );
-        }
-
-        void writeTestCase( TestCaseNode const& testCaseNode ) {
-            TestCaseStats const& stats = testCaseNode.value;
-
-            // All test cases have exactly one section - which represents the
-            // test case itself. That section may have 0-n nested sections
-            assert( testCaseNode.children.size() == 1 );
-            SectionNode const& rootSection = *testCaseNode.children.front();
-
-            std::string className = stats.testInfo.className;
-
-            if( className.empty() ) {
-                if( rootSection.childSections.empty() )
-                    className = "global";
-            }
-            writeSection( className, "", rootSection );
-        }
-
-        void writeSection(  std::string const& className,
-                            std::string const& rootName,
-                            SectionNode const& sectionNode ) {
-            std::string name = trim( sectionNode.stats.sectionInfo.name );
-            if( !rootName.empty() )
-                name = rootName + "/" + name;
-
-            if( !sectionNode.assertions.empty() ||
-                !sectionNode.stdOut.empty() ||
-                !sectionNode.stdErr.empty() ) {
-                XmlWriter::ScopedElement e = xml.scopedElement( "testcase" );
-                if( className.empty() ) {
-                    xml.writeAttribute( "classname", name );
-                    xml.writeAttribute( "name", "root" );
-                }
-                else {
-                    xml.writeAttribute( "classname", className );
-                    xml.writeAttribute( "name", name );
-                }
-                xml.writeAttribute( "time", Catch::toString( sectionNode.stats.durationInSeconds ) );
-
-                writeAssertions( sectionNode );
-
-                if( !sectionNode.stdOut.empty() )
-                    xml.scopedElement( "system-out" ).writeText( trim( sectionNode.stdOut ), false );
-                if( !sectionNode.stdErr.empty() )
-                    xml.scopedElement( "system-err" ).writeText( trim( sectionNode.stdErr ), false );
-            }
-            for( SectionNode::ChildSections::const_iterator
-                    it = sectionNode.childSections.begin(),
-                    itEnd = sectionNode.childSections.end();
-                    it != itEnd;
-                    ++it )
-                if( className.empty() )
-                    writeSection( name, "", **it );
-                else
-                    writeSection( className, name, **it );
-        }
-
-        void writeAssertions( SectionNode const& sectionNode ) {
-            for( SectionNode::Assertions::const_iterator
-                    it = sectionNode.assertions.begin(), itEnd = sectionNode.assertions.end();
-                    it != itEnd;
-                    ++it )
-                writeAssertion( *it );
-        }
-        void writeAssertion( AssertionStats const& stats ) {
-            AssertionResult const& result = stats.assertionResult;
-            if( !result.isOk() ) {
-                std::string elementName;
-                switch( result.getResultType() ) {
-                    case ResultWas::ThrewException:
-                    case ResultWas::FatalErrorCondition:
-                        elementName = "error";
-                        break;
-                    case ResultWas::ExplicitFailure:
-                        elementName = "failure";
-                        break;
-                    case ResultWas::ExpressionFailed:
-                        elementName = "failure";
-                        break;
-                    case ResultWas::DidntThrowException:
-                        elementName = "failure";
-                        break;
-
-                    // We should never see these here:
-                    case ResultWas::Info:
-                    case ResultWas::Warning:
-                    case ResultWas::Ok:
-                    case ResultWas::Unknown:
-                    case ResultWas::FailureBit:
-                    case ResultWas::Exception:
-                        elementName = "internalError";
-                        break;
-                }
-
-                XmlWriter::ScopedElement e = xml.scopedElement( elementName );
-
-                xml.writeAttribute( "message", result.getExpandedExpression() );
-                xml.writeAttribute( "type", result.getTestMacroName() );
-
-                std::ostringstream oss;
-                if( !result.getMessage().empty() )
-                    oss << result.getMessage() << "\n";
-                for( std::vector<MessageInfo>::const_iterator
-                        it = stats.infoMessages.begin(),
-                        itEnd = stats.infoMessages.end();
-                            it != itEnd;
-                            ++it )
-                    if( it->type == ResultWas::Info )
-                        oss << it->message << "\n";
-
-                oss << "at " << result.getSourceInfo();
-                xml.writeText( oss.str(), false );
-            }
-        }
-
-        XmlWriter xml;
-        Timer suiteTimer;
-        std::ostringstream stdOutForSuite;
-        std::ostringstream stdErrForSuite;
-        unsigned int unexpectedExceptions;
-    };
-
-    INTERNAL_CATCH_REGISTER_REPORTER( "junit", JunitReporter )
-
-} // end namespace Catch
-
-// #included from: ../reporters/catch_reporter_console.hpp
-#define TWOBLUECUBES_CATCH_REPORTER_CONSOLE_HPP_INCLUDED
-
-namespace Catch {
-
-    struct ConsoleReporter : StreamingReporterBase {
-        ConsoleReporter( ReporterConfig const& _config )
-        :   StreamingReporterBase( _config ),
-            m_headerPrinted( false )
-        {}
-
-        virtual ~ConsoleReporter() CATCH_OVERRIDE;
-        static std::string getDescription() {
-            return "Reports test results as plain lines of text";
-        }
-
-        virtual void noMatchingTestCases( std::string const& spec ) CATCH_OVERRIDE {
-            stream << "No test cases matched '" << spec << "'" << std::endl;
-        }
-
-        virtual void assertionStarting( AssertionInfo const& ) CATCH_OVERRIDE {
-        }
-
-        virtual bool assertionEnded( AssertionStats const& _assertionStats ) CATCH_OVERRIDE {
-            AssertionResult const& result = _assertionStats.assertionResult;
-
-            bool printInfoMessages = true;
-
-            // Drop out if result was successful and we're not printing those
-            if( !m_config->includeSuccessfulResults() && result.isOk() ) {
-                if( result.getResultType() != ResultWas::Warning )
-                    return false;
-                printInfoMessages = false;
-            }
-
-            lazyPrint();
-
-            AssertionPrinter printer( stream, _assertionStats, printInfoMessages );
-            printer.print();
-            stream << std::endl;
-            return true;
-        }
-
-        virtual void sectionStarting( SectionInfo const& _sectionInfo ) CATCH_OVERRIDE {
-            m_headerPrinted = false;
-            StreamingReporterBase::sectionStarting( _sectionInfo );
-        }
-        virtual void sectionEnded( SectionStats const& _sectionStats ) CATCH_OVERRIDE {
-            if( _sectionStats.missingAssertions ) {
-                lazyPrint();
-                Colour colour( Colour::ResultError );
-                if( m_sectionStack.size() > 1 )
-                    stream << "\nNo assertions in section";
-                else
-                    stream << "\nNo assertions in test case";
-                stream << " '" << _sectionStats.sectionInfo.name << "'\n" << std::endl;
-            }
-            if( m_headerPrinted ) {
-                if( m_config->showDurations() == ShowDurations::Always )
-                    stream << "Completed in " << _sectionStats.durationInSeconds << "s" << std::endl;
-                m_headerPrinted = false;
-            }
-            else {
-                if( m_config->showDurations() == ShowDurations::Always )
-                    stream << _sectionStats.sectionInfo.name << " completed in " << _sectionStats.durationInSeconds << "s" << std::endl;
-            }
-            StreamingReporterBase::sectionEnded( _sectionStats );
-        }
-
-        virtual void testCaseEnded( TestCaseStats const& _testCaseStats ) CATCH_OVERRIDE {
-            StreamingReporterBase::testCaseEnded( _testCaseStats );
-            m_headerPrinted = false;
-        }
-        virtual void testGroupEnded( TestGroupStats const& _testGroupStats ) CATCH_OVERRIDE {
-            if( currentGroupInfo.used ) {
-                printSummaryDivider();
-                stream << "Summary for group '" << _testGroupStats.groupInfo.name << "':\n";
-                printTotals( _testGroupStats.totals );
-                stream << "\n" << std::endl;
-            }
-            StreamingReporterBase::testGroupEnded( _testGroupStats );
-        }
-        virtual void testRunEnded( TestRunStats const& _testRunStats ) CATCH_OVERRIDE {
-            printTotalsDivider( _testRunStats.totals );
-            printTotals( _testRunStats.totals );
-            stream << std::endl;
-            StreamingReporterBase::testRunEnded( _testRunStats );
-        }
-
-    private:
-
-        class AssertionPrinter {
-            void operator= ( AssertionPrinter const& );
-        public:
-            AssertionPrinter( std::ostream& _stream, AssertionStats const& _stats, bool _printInfoMessages )
-            :   stream( _stream ),
-                stats( _stats ),
-                result( _stats.assertionResult ),
-                colour( Colour::None ),
-                message( result.getMessage() ),
-                messages( _stats.infoMessages ),
-                printInfoMessages( _printInfoMessages )
-            {
-                switch( result.getResultType() ) {
-                    case ResultWas::Ok:
-                        colour = Colour::Success;
-                        passOrFail = "PASSED";
-                        //if( result.hasMessage() )
-                        if( _stats.infoMessages.size() == 1 )
-                            messageLabel = "with message";
-                        if( _stats.infoMessages.size() > 1 )
-                            messageLabel = "with messages";
-                        break;
-                    case ResultWas::ExpressionFailed:
-                        if( result.isOk() ) {
-                            colour = Colour::Success;
-                            passOrFail = "FAILED - but was ok";
-                        }
-                        else {
-                            colour = Colour::Error;
-                            passOrFail = "FAILED";
-                        }
-                        if( _stats.infoMessages.size() == 1 )
-                            messageLabel = "with message";
-                        if( _stats.infoMessages.size() > 1 )
-                            messageLabel = "with messages";
-                        break;
-                    case ResultWas::ThrewException:
-                        colour = Colour::Error;
-                        passOrFail = "FAILED";
-                        messageLabel = "due to unexpected exception with message";
-                        break;
-                    case ResultWas::FatalErrorCondition:
-                        colour = Colour::Error;
-                        passOrFail = "FAILED";
-                        messageLabel = "due to a fatal error condition";
-                        break;
-                    case ResultWas::DidntThrowException:
-                        colour = Colour::Error;
-                        passOrFail = "FAILED";
-                        messageLabel = "because no exception was thrown where one was expected";
-                        break;
-                    case ResultWas::Info:
-                        messageLabel = "info";
-                        break;
-                    case ResultWas::Warning:
-                        messageLabel = "warning";
-                        break;
-                    case ResultWas::ExplicitFailure:
-                        passOrFail = "FAILED";
-                        colour = Colour::Error;
-                        if( _stats.infoMessages.size() == 1 )
-                            messageLabel = "explicitly with message";
-                        if( _stats.infoMessages.size() > 1 )
-                            messageLabel = "explicitly with messages";
-                        break;
-                    // These cases are here to prevent compiler warnings
-                    case ResultWas::Unknown:
-                    case ResultWas::FailureBit:
-                    case ResultWas::Exception:
-                        passOrFail = "** internal error **";
-                        colour = Colour::Error;
-                        break;
-                }
-            }
-
-            void print() const {
-                printSourceInfo();
-                if( stats.totals.assertions.total() > 0 ) {
-                    if( result.isOk() )
-                        stream << "\n";
-                    printResultType();
-                    printOriginalExpression();
-                    printReconstructedExpression();
-                }
-                else {
-                    stream << "\n";
-                }
-                printMessage();
-            }
-
-        private:
-            void printResultType() const {
-                if( !passOrFail.empty() ) {
-                    Colour colourGuard( colour );
-                    stream << passOrFail << ":\n";
-                }
-            }
-            void printOriginalExpression() const {
-                if( result.hasExpression() ) {
-                    Colour colourGuard( Colour::OriginalExpression );
-                    stream  << "  ";
-                    stream << result.getExpressionInMacro();
-                    stream << "\n";
-                }
-            }
-            void printReconstructedExpression() const {
-                if( result.hasExpandedExpression() ) {
-                    stream << "with expansion:\n";
-                    Colour colourGuard( Colour::ReconstructedExpression );
-                    stream << Text( result.getExpandedExpression(), TextAttributes().setIndent(2) ) << "\n";
-                }
-            }
-            void printMessage() const {
-                if( !messageLabel.empty() )
-                    stream << messageLabel << ":" << "\n";
-                for( std::vector<MessageInfo>::const_iterator it = messages.begin(), itEnd = messages.end();
-                        it != itEnd;
-                        ++it ) {
-                    // If this assertion is a warning ignore any INFO messages
-                    if( printInfoMessages || it->type != ResultWas::Info )
-                        stream << Text( it->message, TextAttributes().setIndent(2) ) << "\n";
-                }
-            }
-            void printSourceInfo() const {
-                Colour colourGuard( Colour::FileName );
-                stream << result.getSourceInfo() << ": ";
-            }
-
-            std::ostream& stream;
-            AssertionStats const& stats;
-            AssertionResult const& result;
-            Colour::Code colour;
-            std::string passOrFail;
-            std::string messageLabel;
-            std::string message;
-            std::vector<MessageInfo> messages;
-            bool printInfoMessages;
-        };
-
-        void lazyPrint() {
-
-            if( !currentTestRunInfo.used )
-                lazyPrintRunInfo();
-            if( !currentGroupInfo.used )
-                lazyPrintGroupInfo();
-
-            if( !m_headerPrinted ) {
-                printTestCaseAndSectionHeader();
-                m_headerPrinted = true;
-            }
-        }
-        void lazyPrintRunInfo() {
-            stream  << "\n" << getLineOfChars<'~'>() << "\n";
-            Colour colour( Colour::SecondaryText );
-            stream  << currentTestRunInfo->name
-                    << " is a Catch v"  << libraryVersion << " host application.\n"
-                    << "Run with -? for options\n\n";
-
-            if( m_config->rngSeed() != 0 )
-                stream << "Randomness seeded to: " << m_config->rngSeed() << "\n\n";
-
-            currentTestRunInfo.used = true;
-        }
-        void lazyPrintGroupInfo() {
-            if( !currentGroupInfo->name.empty() && currentGroupInfo->groupsCounts > 1 ) {
-                printClosedHeader( "Group: " + currentGroupInfo->name );
-                currentGroupInfo.used = true;
-            }
-        }
-        void printTestCaseAndSectionHeader() {
-            assert( !m_sectionStack.empty() );
-            printOpenHeader( currentTestCaseInfo->name );
-
-            if( m_sectionStack.size() > 1 ) {
-                Colour colourGuard( Colour::Headers );
-
-                std::vector<SectionInfo>::const_iterator
-                    it = m_sectionStack.begin()+1, // Skip first section (test case)
-                    itEnd = m_sectionStack.end();
-                for( ; it != itEnd; ++it )
-                    printHeaderString( it->name, 2 );
-            }
-
-            SourceLineInfo lineInfo = m_sectionStack.front().lineInfo;
-
-            if( !lineInfo.empty() ){
-                stream << getLineOfChars<'-'>() << "\n";
-                Colour colourGuard( Colour::FileName );
-                stream << lineInfo << "\n";
-            }
-            stream << getLineOfChars<'.'>() << "\n" << std::endl;
-        }
-
-        void printClosedHeader( std::string const& _name ) {
-            printOpenHeader( _name );
-            stream << getLineOfChars<'.'>() << "\n";
-        }
-        void printOpenHeader( std::string const& _name ) {
-            stream  << getLineOfChars<'-'>() << "\n";
-            {
-                Colour colourGuard( Colour::Headers );
-                printHeaderString( _name );
-            }
-        }
-
-        // if string has a : in first line will set indent to follow it on
-        // subsequent lines
-        void printHeaderString( std::string const& _string, std::size_t indent = 0 ) {
-            std::size_t i = _string.find( ": " );
-            if( i != std::string::npos )
-                i+=2;
-            else
-                i = 0;
-            stream << Text( _string, TextAttributes()
-                                        .setIndent( indent+i)
-                                        .setInitialIndent( indent ) ) << "\n";
-        }
-
-        struct SummaryColumn {
-
-            SummaryColumn( std::string const& _label, Colour::Code _colour )
-            :   label( _label ),
-                colour( _colour )
-            {}
-            SummaryColumn addRow( std::size_t count ) {
-                std::ostringstream oss;
-                oss << count;
-                std::string row = oss.str();
-                for( std::vector<std::string>::iterator it = rows.begin(); it != rows.end(); ++it ) {
-                    while( it->size() < row.size() )
-                        *it = " " + *it;
-                    while( it->size() > row.size() )
-                        row = " " + row;
-                }
-                rows.push_back( row );
-                return *this;
-            }
-
-            std::string label;
-            Colour::Code colour;
-            std::vector<std::string> rows;
-
-        };
-
-        void printTotals( Totals const& totals ) {
-            if( totals.testCases.total() == 0 ) {
-                stream << Colour( Colour::Warning ) << "No tests ran\n";
-            }
-            else if( totals.assertions.total() > 0 && totals.testCases.allPassed() ) {
-                stream << Colour( Colour::ResultSuccess ) << "All tests passed";
-                stream << " ("
-                        << pluralise( totals.assertions.passed, "assertion" ) << " in "
-                        << pluralise( totals.testCases.passed, "test case" ) << ")"
-                        << "\n";
-            }
-            else {
-
-                std::vector<SummaryColumn> columns;
-                columns.push_back( SummaryColumn( "", Colour::None )
-                                        .addRow( totals.testCases.total() )
-                                        .addRow( totals.assertions.total() ) );
-                columns.push_back( SummaryColumn( "passed", Colour::Success )
-                                        .addRow( totals.testCases.passed )
-                                        .addRow( totals.assertions.passed ) );
-                columns.push_back( SummaryColumn( "failed", Colour::ResultError )
-                                        .addRow( totals.testCases.failed )
-                                        .addRow( totals.assertions.failed ) );
-                columns.push_back( SummaryColumn( "failed as expected", Colour::ResultExpectedFailure )
-                                        .addRow( totals.testCases.failedButOk )
-                                        .addRow( totals.assertions.failedButOk ) );
-
-                printSummaryRow( "test cases", columns, 0 );
-                printSummaryRow( "assertions", columns, 1 );
-            }
-        }
-        void printSummaryRow( std::string const& label, std::vector<SummaryColumn> const& cols, std::size_t row ) {
-            for( std::vector<SummaryColumn>::const_iterator it = cols.begin(); it != cols.end(); ++it ) {
-                std::string value = it->rows[row];
-                if( it->label.empty() ) {
-                    stream << label << ": ";
-                    if( value != "0" )
-                        stream << value;
-                    else
-                        stream << Colour( Colour::Warning ) << "- none -";
-                }
-                else if( value != "0" ) {
-                    stream  << Colour( Colour::LightGrey ) << " | ";
-                    stream  << Colour( it->colour )
-                            << value << " " << it->label;
-                }
-            }
-            stream << "\n";
-        }
-
-        static std::size_t makeRatio( std::size_t number, std::size_t total ) {
-            std::size_t ratio = total > 0 ? CATCH_CONFIG_CONSOLE_WIDTH * number/ total : 0;
-            return ( ratio == 0 && number > 0 ) ? 1 : ratio;
-        }
-        static std::size_t& findMax( std::size_t& i, std::size_t& j, std::size_t& k ) {
-            if( i > j && i > k )
-                return i;
-            else if( j > k )
-                return j;
-            else
-                return k;
-        }
-
-        void printTotalsDivider( Totals const& totals ) {
-            if( totals.testCases.total() > 0 ) {
-                std::size_t failedRatio = makeRatio( totals.testCases.failed, totals.testCases.total() );
-                std::size_t failedButOkRatio = makeRatio( totals.testCases.failedButOk, totals.testCases.total() );
-                std::size_t passedRatio = makeRatio( totals.testCases.passed, totals.testCases.total() );
-                while( failedRatio + failedButOkRatio + passedRatio < CATCH_CONFIG_CONSOLE_WIDTH-1 )
-                    findMax( failedRatio, failedButOkRatio, passedRatio )++;
-                while( failedRatio + failedButOkRatio + passedRatio > CATCH_CONFIG_CONSOLE_WIDTH-1 )
-                    findMax( failedRatio, failedButOkRatio, passedRatio )--;
-
-                stream << Colour( Colour::Error ) << std::string( failedRatio, '=' );
-                stream << Colour( Colour::ResultExpectedFailure ) << std::string( failedButOkRatio, '=' );
-                if( totals.testCases.allPassed() )
-                    stream << Colour( Colour::ResultSuccess ) << std::string( passedRatio, '=' );
-                else
-                    stream << Colour( Colour::Success ) << std::string( passedRatio, '=' );
-            }
-            else {
-                stream << Colour( Colour::Warning ) << std::string( CATCH_CONFIG_CONSOLE_WIDTH-1, '=' );
-            }
-            stream << "\n";
-        }
-        void printSummaryDivider() {
-            stream << getLineOfChars<'-'>() << "\n";
-        }
-
-    private:
-        bool m_headerPrinted;
-    };
-
-    INTERNAL_CATCH_REGISTER_REPORTER( "console", ConsoleReporter )
-
-} // end namespace Catch
-
-// #included from: ../reporters/catch_reporter_compact.hpp
-#define TWOBLUECUBES_CATCH_REPORTER_COMPACT_HPP_INCLUDED
-
-namespace Catch {
-
-    struct CompactReporter : StreamingReporterBase {
-
-        CompactReporter( ReporterConfig const& _config )
-        : StreamingReporterBase( _config )
-        {}
-
-        virtual ~CompactReporter();
-
-        static std::string getDescription() {
-            return "Reports test results on a single line, suitable for IDEs";
-        }
-
-        virtual ReporterPreferences getPreferences() const {
-            ReporterPreferences prefs;
-            prefs.shouldRedirectStdOut = false;
-            return prefs;
-        }
-
-        virtual void noMatchingTestCases( std::string const& spec ) {
-            stream << "No test cases matched '" << spec << "'" << std::endl;
-        }
-
-        virtual void assertionStarting( AssertionInfo const& ) {
-        }
-
-        virtual bool assertionEnded( AssertionStats const& _assertionStats ) {
-            AssertionResult const& result = _assertionStats.assertionResult;
-
-            bool printInfoMessages = true;
-
-            // Drop out if result was successful and we're not printing those
-            if( !m_config->includeSuccessfulResults() && result.isOk() ) {
-                if( result.getResultType() != ResultWas::Warning )
-                    return false;
-                printInfoMessages = false;
-            }
-
-            AssertionPrinter printer( stream, _assertionStats, printInfoMessages );
-            printer.print();
-
-            stream << std::endl;
-            return true;
-        }
-
-        virtual void testRunEnded( TestRunStats const& _testRunStats ) {
-            printTotals( _testRunStats.totals );
-            stream << "\n" << std::endl;
-            StreamingReporterBase::testRunEnded( _testRunStats );
-        }
-
-    private:
-        class AssertionPrinter {
-            void operator= ( AssertionPrinter const& );
-        public:
-            AssertionPrinter( std::ostream& _stream, AssertionStats const& _stats, bool _printInfoMessages )
-            : stream( _stream )
-            , stats( _stats )
-            , result( _stats.assertionResult )
-            , messages( _stats.infoMessages )
-            , itMessage( _stats.infoMessages.begin() )
-            , printInfoMessages( _printInfoMessages )
-            {}
-
-            void print() {
-                printSourceInfo();
-
-                itMessage = messages.begin();
-
-                switch( result.getResultType() ) {
-                    case ResultWas::Ok:
-                        printResultType( Colour::ResultSuccess, passedString() );
-                        printOriginalExpression();
-                        printReconstructedExpression();
-                        if ( ! result.hasExpression() )
-                            printRemainingMessages( Colour::None );
-                        else
-                            printRemainingMessages();
-                        break;
-                    case ResultWas::ExpressionFailed:
-                        if( result.isOk() )
-                            printResultType( Colour::ResultSuccess, failedString() + std::string( " - but was ok" ) );
-                        else
-                            printResultType( Colour::Error, failedString() );
-                        printOriginalExpression();
-                        printReconstructedExpression();
-                        printRemainingMessages();
-                        break;
-                    case ResultWas::ThrewException:
-                        printResultType( Colour::Error, failedString() );
-                        printIssue( "unexpected exception with message:" );
-                        printMessage();
-                        printExpressionWas();
-                        printRemainingMessages();
-                        break;
-                    case ResultWas::FatalErrorCondition:
-                        printResultType( Colour::Error, failedString() );
-                        printIssue( "fatal error condition with message:" );
-                        printMessage();
-                        printExpressionWas();
-                        printRemainingMessages();
-                        break;
-                    case ResultWas::DidntThrowException:
-                        printResultType( Colour::Error, failedString() );
-                        printIssue( "expected exception, got none" );
-                        printExpressionWas();
-                        printRemainingMessages();
-                        break;
-                    case ResultWas::Info:
-                        printResultType( Colour::None, "info" );
-                        printMessage();
-                        printRemainingMessages();
-                        break;
-                    case ResultWas::Warning:
-                        printResultType( Colour::None, "warning" );
-                        printMessage();
-                        printRemainingMessages();
-                        break;
-                    case ResultWas::ExplicitFailure:
-                        printResultType( Colour::Error, failedString() );
-                        printIssue( "explicitly" );
-                        printRemainingMessages( Colour::None );
-                        break;
-                    // These cases are here to prevent compiler warnings
-                    case ResultWas::Unknown:
-                    case ResultWas::FailureBit:
-                    case ResultWas::Exception:
-                        printResultType( Colour::Error, "** internal error **" );
-                        break;
-                }
-            }
-
-        private:
-            // Colour::LightGrey
-
-            static Colour::Code dimColour() { return Colour::FileName; }
-
-#ifdef CATCH_PLATFORM_MAC
-            static const char* failedString() { return "FAILED"; }
-            static const char* passedString() { return "PASSED"; }
-#else
-            static const char* failedString() { return "failed"; }
-            static const char* passedString() { return "passed"; }
-#endif
-
-            void printSourceInfo() const {
-                Colour colourGuard( Colour::FileName );
-                stream << result.getSourceInfo() << ":";
-            }
-
-            void printResultType( Colour::Code colour, std::string passOrFail ) const {
-                if( !passOrFail.empty() ) {
-                    {
-                        Colour colourGuard( colour );
-                        stream << " " << passOrFail;
-                    }
-                    stream << ":";
-                }
-            }
-
-            void printIssue( std::string issue ) const {
-                stream << " " << issue;
-            }
-
-            void printExpressionWas() {
-                if( result.hasExpression() ) {
-                    stream << ";";
-                    {
-                        Colour colour( dimColour() );
-                        stream << " expression was:";
-                    }
-                    printOriginalExpression();
-                }
-            }
-
-            void printOriginalExpression() const {
-                if( result.hasExpression() ) {
-                    stream << " " << result.getExpression();
-                }
-            }
-
-            void printReconstructedExpression() const {
-                if( result.hasExpandedExpression() ) {
-                    {
-                        Colour colour( dimColour() );
-                        stream << " for: ";
-                    }
-                    stream << result.getExpandedExpression();
-                }
-            }
-
-            void printMessage() {
-                if ( itMessage != messages.end() ) {
-                    stream << " '" << itMessage->message << "'";
-                    ++itMessage;
-                }
-            }
-
-            void printRemainingMessages( Colour::Code colour = dimColour() ) {
-                if ( itMessage == messages.end() )
-                    return;
-
-                // using messages.end() directly yields compilation error:
-                std::vector<MessageInfo>::const_iterator itEnd = messages.end();
-                const std::size_t N = static_cast<std::size_t>( std::distance( itMessage, itEnd ) );
-
-                {
-                    Colour colourGuard( colour );
-                    stream << " with " << pluralise( N, "message" ) << ":";
-                }
-
-                for(; itMessage != itEnd; ) {
-                    // If this assertion is a warning ignore any INFO messages
-                    if( printInfoMessages || itMessage->type != ResultWas::Info ) {
-                        stream << " '" << itMessage->message << "'";
-                        if ( ++itMessage != itEnd ) {
-                            Colour colourGuard( dimColour() );
-                            stream << " and";
-                        }
-                    }
-                }
-            }
-
-        private:
-            std::ostream& stream;
-            AssertionStats const& stats;
-            AssertionResult const& result;
-            std::vector<MessageInfo> messages;
-            std::vector<MessageInfo>::const_iterator itMessage;
-            bool printInfoMessages;
-        };
-
-        // Colour, message variants:
-        // - white: No tests ran.
-        // -   red: Failed [both/all] N test cases, failed [both/all] M assertions.
-        // - white: Passed [both/all] N test cases (no assertions).
-        // -   red: Failed N tests cases, failed M assertions.
-        // - green: Passed [both/all] N tests cases with M assertions.
-
-        std::string bothOrAll( std::size_t count ) const {
-            return count == 1 ? "" : count == 2 ? "both " : "all " ;
-        }
-
-        void printTotals( const Totals& totals ) const {
-            if( totals.testCases.total() == 0 ) {
-                stream << "No tests ran.";
-            }
-            else if( totals.testCases.failed == totals.testCases.total() ) {
-                Colour colour( Colour::ResultError );
-                const std::string qualify_assertions_failed =
-                    totals.assertions.failed == totals.assertions.total() ?
-                        bothOrAll( totals.assertions.failed ) : "";
-                stream <<
-                    "Failed " << bothOrAll( totals.testCases.failed )
-                              << pluralise( totals.testCases.failed, "test case"  ) << ", "
-                    "failed " << qualify_assertions_failed <<
-                                 pluralise( totals.assertions.failed, "assertion" ) << ".";
-            }
-            else if( totals.assertions.total() == 0 ) {
-                stream <<
-                    "Passed " << bothOrAll( totals.testCases.total() )
-                              << pluralise( totals.testCases.total(), "test case" )
-                              << " (no assertions).";
-            }
-            else if( totals.assertions.failed ) {
-                Colour colour( Colour::ResultError );
-                stream <<
-                    "Failed " << pluralise( totals.testCases.failed, "test case"  ) << ", "
-                    "failed " << pluralise( totals.assertions.failed, "assertion" ) << ".";
-            }
-            else {
-                Colour colour( Colour::ResultSuccess );
-                stream <<
-                    "Passed " << bothOrAll( totals.testCases.passed )
-                              << pluralise( totals.testCases.passed, "test case"  ) <<
-                    " with "  << pluralise( totals.assertions.passed, "assertion" ) << ".";
-            }
-        }
-    };
-
-    INTERNAL_CATCH_REGISTER_REPORTER( "compact", CompactReporter )
-
-} // end namespace Catch
-
-namespace Catch {
-    // These are all here to avoid warnings about not having any out of line
-    // virtual methods
-    NonCopyable::~NonCopyable() {}
-    IShared::~IShared() {}
-    IStream::~IStream() CATCH_NOEXCEPT {}
-    FileStream::~FileStream() CATCH_NOEXCEPT {}
-    CoutStream::~CoutStream() CATCH_NOEXCEPT {}
-    DebugOutStream::~DebugOutStream() CATCH_NOEXCEPT {}
-    StreamBufBase::~StreamBufBase() CATCH_NOEXCEPT {}
-    IContext::~IContext() {}
-    IResultCapture::~IResultCapture() {}
-    ITestCase::~ITestCase() {}
-    ITestCaseRegistry::~ITestCaseRegistry() {}
-    IRegistryHub::~IRegistryHub() {}
-    IMutableRegistryHub::~IMutableRegistryHub() {}
-    IExceptionTranslator::~IExceptionTranslator() {}
-    IExceptionTranslatorRegistry::~IExceptionTranslatorRegistry() {}
-    IReporter::~IReporter() {}
-    IReporterFactory::~IReporterFactory() {}
-    IReporterRegistry::~IReporterRegistry() {}
-    IStreamingReporter::~IStreamingReporter() {}
-    AssertionStats::~AssertionStats() {}
-    SectionStats::~SectionStats() {}
-    TestCaseStats::~TestCaseStats() {}
-    TestGroupStats::~TestGroupStats() {}
-    TestRunStats::~TestRunStats() {}
-    CumulativeReporterBase::SectionNode::~SectionNode() {}
-    CumulativeReporterBase::~CumulativeReporterBase() {}
-
-    StreamingReporterBase::~StreamingReporterBase() {}
-    ConsoleReporter::~ConsoleReporter() {}
-    CompactReporter::~CompactReporter() {}
-    IRunner::~IRunner() {}
-    IMutableContext::~IMutableContext() {}
-    IConfig::~IConfig() {}
-    XmlReporter::~XmlReporter() {}
-    JunitReporter::~JunitReporter() {}
-    TestRegistry::~TestRegistry() {}
-    FreeFunctionTestCase::~FreeFunctionTestCase() {}
-    IGeneratorInfo::~IGeneratorInfo() {}
-    IGeneratorsForTest::~IGeneratorsForTest() {}
-    WildcardPattern::~WildcardPattern() {}
-    TestSpec::Pattern::~Pattern() {}
-    TestSpec::NamePattern::~NamePattern() {}
-    TestSpec::TagPattern::~TagPattern() {}
-    TestSpec::ExcludedPattern::~ExcludedPattern() {}
-
-    Matchers::Impl::StdString::Equals::~Equals() {}
-    Matchers::Impl::StdString::Contains::~Contains() {}
-    Matchers::Impl::StdString::StartsWith::~StartsWith() {}
-    Matchers::Impl::StdString::EndsWith::~EndsWith() {}
-
-    void Config::dummy() {}
-
-    namespace TestCaseTracking {
-        ITracker::~ITracker() {}
-        TrackerBase::~TrackerBase() {}
-        SectionTracker::~SectionTracker() {}
-        IndexTracker::~IndexTracker() {}
-    }
-}
-
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
-#endif
-
-#ifdef CATCH_CONFIG_MAIN
-// #included from: internal/catch_default_main.hpp
-#define TWOBLUECUBES_CATCH_DEFAULT_MAIN_HPP_INCLUDED
-
-#ifndef __OBJC__
-
-// Standard C/C++ main entry point
-int main (int argc, char * argv[]) {
-    return Catch::Session().run( argc, argv );
-}
-
-#else // __OBJC__
-
-// Objective-C entry point
-int main (int argc, char * const argv[]) {
-#if !CATCH_ARC_ENABLED
-    NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
-#endif
-
-    Catch::registerTestMethods();
-    int result = Catch::Session().run( argc, (char* const*)argv );
-
-#if !CATCH_ARC_ENABLED
-    [pool drain];
-#endif
-
-    return result;
-}
-
-#endif // __OBJC__
-
-#endif
-
-#ifdef CLARA_CONFIG_MAIN_NOT_DEFINED
-#  undef CLARA_CONFIG_MAIN
-#endif
-
-//////
-
-// If this config identifier is defined then all CATCH macros are prefixed with CATCH_
-#ifdef CATCH_CONFIG_PREFIX_ALL
-
-#define CATCH_REQUIRE( expr ) INTERNAL_CATCH_TEST( expr, Catch::ResultDisposition::Normal, "CATCH_REQUIRE" )
-#define CATCH_REQUIRE_FALSE( expr ) INTERNAL_CATCH_TEST( expr, Catch::ResultDisposition::Normal | Catch::ResultDisposition::FalseTest, "CATCH_REQUIRE_FALSE" )
-
-#define CATCH_REQUIRE_THROWS( expr ) INTERNAL_CATCH_THROWS( expr, Catch::ResultDisposition::Normal, "", "CATCH_REQUIRE_THROWS" )
-#define CATCH_REQUIRE_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( expr, exceptionType, Catch::ResultDisposition::Normal, "CATCH_REQUIRE_THROWS_AS" )
-#define CATCH_REQUIRE_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS( expr, Catch::ResultDisposition::Normal, matcher, "CATCH_REQUIRE_THROWS_WITH" )
-#define CATCH_REQUIRE_NOTHROW( expr ) INTERNAL_CATCH_NO_THROW( expr, Catch::ResultDisposition::Normal, "CATCH_REQUIRE_NOTHROW" )
-
-#define CATCH_CHECK( expr ) INTERNAL_CATCH_TEST( expr, Catch::ResultDisposition::ContinueOnFailure, "CATCH_CHECK" )
-#define CATCH_CHECK_FALSE( expr ) INTERNAL_CATCH_TEST( expr, Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::FalseTest, "CATCH_CHECK_FALSE" )
-#define CATCH_CHECKED_IF( expr ) INTERNAL_CATCH_IF( expr, Catch::ResultDisposition::ContinueOnFailure, "CATCH_CHECKED_IF" )
-#define CATCH_CHECKED_ELSE( expr ) INTERNAL_CATCH_ELSE( expr, Catch::ResultDisposition::ContinueOnFailure, "CATCH_CHECKED_ELSE" )
-#define CATCH_CHECK_NOFAIL( expr ) INTERNAL_CATCH_TEST( expr, Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::SuppressFail, "CATCH_CHECK_NOFAIL" )
-
-#define CATCH_CHECK_THROWS( expr )  INTERNAL_CATCH_THROWS( expr, Catch::ResultDisposition::ContinueOnFailure, "CATCH_CHECK_THROWS" )
-#define CATCH_CHECK_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( expr, exceptionType, Catch::ResultDisposition::ContinueOnFailure, "CATCH_CHECK_THROWS_AS" )
-#define CATCH_CHECK_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS( expr, Catch::ResultDisposition::ContinueOnFailure, matcher, "CATCH_CHECK_THROWS_WITH" )
-#define CATCH_CHECK_NOTHROW( expr ) INTERNAL_CATCH_NO_THROW( expr, Catch::ResultDisposition::ContinueOnFailure, "CATCH_CHECK_NOTHROW" )
-
-#define CHECK_THAT( arg, matcher ) INTERNAL_CHECK_THAT( arg, matcher, Catch::ResultDisposition::ContinueOnFailure, "CATCH_CHECK_THAT" )
-#define CATCH_REQUIRE_THAT( arg, matcher ) INTERNAL_CHECK_THAT( arg, matcher, Catch::ResultDisposition::Normal, "CATCH_REQUIRE_THAT" )
-
-#define CATCH_INFO( msg ) INTERNAL_CATCH_INFO( msg, "CATCH_INFO" )
-#define CATCH_WARN( msg ) INTERNAL_CATCH_MSG( Catch::ResultWas::Warning, Catch::ResultDisposition::ContinueOnFailure, "CATCH_WARN", msg )
-#define CATCH_SCOPED_INFO( msg ) INTERNAL_CATCH_INFO( msg, "CATCH_INFO" )
-#define CATCH_CAPTURE( msg ) INTERNAL_CATCH_INFO( #msg " := " << msg, "CATCH_CAPTURE" )
-#define CATCH_SCOPED_CAPTURE( msg ) INTERNAL_CATCH_INFO( #msg " := " << msg, "CATCH_CAPTURE" )
-
-#ifdef CATCH_CONFIG_VARIADIC_MACROS
-    #define CATCH_TEST_CASE( ... ) INTERNAL_CATCH_TESTCASE( __VA_ARGS__ )
-    #define CATCH_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, __VA_ARGS__ )
-    #define CATCH_METHOD_AS_TEST_CASE( method, ... ) INTERNAL_CATCH_METHOD_AS_TEST_CASE( method, __VA_ARGS__ )
-    #define CATCH_REGISTER_TEST_CASE( Function, ... ) INTERNAL_CATCH_REGISTER_TESTCASE( Function, __VA_ARGS__ )
-    #define CATCH_SECTION( ... ) INTERNAL_CATCH_SECTION( __VA_ARGS__ )
-    #define CATCH_FAIL( ... ) INTERNAL_CATCH_MSG( Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::Normal, "CATCH_FAIL", __VA_ARGS__ )
-    #define CATCH_SUCCEED( ... ) INTERNAL_CATCH_MSG( Catch::ResultWas::Ok, Catch::ResultDisposition::ContinueOnFailure, "CATCH_SUCCEED", __VA_ARGS__ )
-#else
-    #define CATCH_TEST_CASE( name, description ) INTERNAL_CATCH_TESTCASE( name, description )
-    #define CATCH_TEST_CASE_METHOD( className, name, description ) INTERNAL_CATCH_TEST_CASE_METHOD( className, name, description )
-    #define CATCH_METHOD_AS_TEST_CASE( method, name, description ) INTERNAL_CATCH_METHOD_AS_TEST_CASE( method, name, description )
-    #define CATCH_REGISTER_TEST_CASE( function, name, description ) INTERNAL_CATCH_REGISTER_TESTCASE( function, name, description )
-    #define CATCH_SECTION( name, description ) INTERNAL_CATCH_SECTION( name, description )
-    #define CATCH_FAIL( msg ) INTERNAL_CATCH_MSG( Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::Normal, "CATCH_FAIL", msg )
-    #define CATCH_SUCCEED( msg ) INTERNAL_CATCH_MSG( Catch::ResultWas::Ok, Catch::ResultDisposition::ContinueOnFailure, "CATCH_SUCCEED", msg )
-#endif
-#define CATCH_ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE( "", "" )
-
-#define CATCH_REGISTER_REPORTER( name, reporterType ) INTERNAL_CATCH_REGISTER_REPORTER( name, reporterType )
-#define CATCH_REGISTER_LEGACY_REPORTER( name, reporterType ) INTERNAL_CATCH_REGISTER_LEGACY_REPORTER( name, reporterType )
-
-#define CATCH_GENERATE( expr) INTERNAL_CATCH_GENERATE( expr )
-
-// "BDD-style" convenience wrappers
-#ifdef CATCH_CONFIG_VARIADIC_MACROS
-#define CATCH_SCENARIO( ... ) CATCH_TEST_CASE( "Scenario: " __VA_ARGS__ )
-#define CATCH_SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, "Scenario: " __VA_ARGS__ )
-#else
-#define CATCH_SCENARIO( name, tags ) CATCH_TEST_CASE( "Scenario: " name, tags )
-#define CATCH_SCENARIO_METHOD( className, name, tags ) INTERNAL_CATCH_TEST_CASE_METHOD( className, "Scenario: " name, tags )
-#endif
-#define CATCH_GIVEN( desc )    CATCH_SECTION( std::string( "Given: ") + desc, "" )
-#define CATCH_WHEN( desc )     CATCH_SECTION( std::string( " When: ") + desc, "" )
-#define CATCH_AND_WHEN( desc ) CATCH_SECTION( std::string( "  And: ") + desc, "" )
-#define CATCH_THEN( desc )     CATCH_SECTION( std::string( " Then: ") + desc, "" )
-#define CATCH_AND_THEN( desc ) CATCH_SECTION( std::string( "  And: ") + desc, "" )
-
-// If CATCH_CONFIG_PREFIX_ALL is not defined then the CATCH_ prefix is not required
-#else
-
-#define REQUIRE( expr ) INTERNAL_CATCH_TEST( expr, Catch::ResultDisposition::Normal, "REQUIRE" )
-#define REQUIRE_FALSE( expr ) INTERNAL_CATCH_TEST( expr, Catch::ResultDisposition::Normal | Catch::ResultDisposition::FalseTest, "REQUIRE_FALSE" )
-
-#define REQUIRE_THROWS( expr ) INTERNAL_CATCH_THROWS( expr, Catch::ResultDisposition::Normal, "", "REQUIRE_THROWS" )
-#define REQUIRE_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( expr, exceptionType, Catch::ResultDisposition::Normal, "REQUIRE_THROWS_AS" )
-#define REQUIRE_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS( expr, Catch::ResultDisposition::Normal, matcher, "REQUIRE_THROWS_WITH" )
-#define REQUIRE_NOTHROW( expr ) INTERNAL_CATCH_NO_THROW( expr, Catch::ResultDisposition::Normal, "REQUIRE_NOTHROW" )
-
-#define CHECK( expr ) INTERNAL_CATCH_TEST( expr, Catch::ResultDisposition::ContinueOnFailure, "CHECK" )
-#define CHECK_FALSE( expr ) INTERNAL_CATCH_TEST( expr, Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::FalseTest, "CHECK_FALSE" )
-#define CHECKED_IF( expr ) INTERNAL_CATCH_IF( expr, Catch::ResultDisposition::ContinueOnFailure, "CHECKED_IF" )
-#define CHECKED_ELSE( expr ) INTERNAL_CATCH_ELSE( expr, Catch::ResultDisposition::ContinueOnFailure, "CHECKED_ELSE" )
-#define CHECK_NOFAIL( expr ) INTERNAL_CATCH_TEST( expr, Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::SuppressFail, "CHECK_NOFAIL" )
-
-#define CHECK_THROWS( expr )  INTERNAL_CATCH_THROWS( expr, Catch::ResultDisposition::ContinueOnFailure, "", "CHECK_THROWS" )
-#define CHECK_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( expr, exceptionType, Catch::ResultDisposition::ContinueOnFailure, "CHECK_THROWS_AS" )
-#define CHECK_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS( expr, Catch::ResultDisposition::ContinueOnFailure, matcher, "CHECK_THROWS_WITH" )
-#define CHECK_NOTHROW( expr ) INTERNAL_CATCH_NO_THROW( expr, Catch::ResultDisposition::ContinueOnFailure, "CHECK_NOTHROW" )
-
-#define CHECK_THAT( arg, matcher ) INTERNAL_CHECK_THAT( arg, matcher, Catch::ResultDisposition::ContinueOnFailure, "CHECK_THAT" )
-#define REQUIRE_THAT( arg, matcher ) INTERNAL_CHECK_THAT( arg, matcher, Catch::ResultDisposition::Normal, "REQUIRE_THAT" )
-
-#define INFO( msg ) INTERNAL_CATCH_INFO( msg, "INFO" )
-#define WARN( msg ) INTERNAL_CATCH_MSG( Catch::ResultWas::Warning, Catch::ResultDisposition::ContinueOnFailure, "WARN", msg )
-#define SCOPED_INFO( msg ) INTERNAL_CATCH_INFO( msg, "INFO" )
-#define CAPTURE( msg ) INTERNAL_CATCH_INFO( #msg " := " << msg, "CAPTURE" )
-#define SCOPED_CAPTURE( msg ) INTERNAL_CATCH_INFO( #msg " := " << msg, "CAPTURE" )
-
-#ifdef CATCH_CONFIG_VARIADIC_MACROS
-    #define TEST_CASE( ... ) INTERNAL_CATCH_TESTCASE( __VA_ARGS__ )
-    #define TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, __VA_ARGS__ )
-    #define METHOD_AS_TEST_CASE( method, ... ) INTERNAL_CATCH_METHOD_AS_TEST_CASE( method, __VA_ARGS__ )
-    #define REGISTER_TEST_CASE( Function, ... ) INTERNAL_CATCH_REGISTER_TESTCASE( Function, __VA_ARGS__ )
-    #define SECTION( ... ) INTERNAL_CATCH_SECTION( __VA_ARGS__ )
-    #define FAIL( ... ) INTERNAL_CATCH_MSG( Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::Normal, "FAIL", __VA_ARGS__ )
-    #define SUCCEED( ... ) INTERNAL_CATCH_MSG( Catch::ResultWas::Ok, Catch::ResultDisposition::ContinueOnFailure, "SUCCEED", __VA_ARGS__ )
-#else
-    #define TEST_CASE( name, description ) INTERNAL_CATCH_TESTCASE( name, description )
-    #define TEST_CASE_METHOD( className, name, description ) INTERNAL_CATCH_TEST_CASE_METHOD( className, name, description )
-    #define METHOD_AS_TEST_CASE( method, name, description ) INTERNAL_CATCH_METHOD_AS_TEST_CASE( method, name, description )
-    #define REGISTER_TEST_CASE( method, name, description ) INTERNAL_CATCH_REGISTER_TESTCASE( method, name, description )
-    #define SECTION( name, description ) INTERNAL_CATCH_SECTION( name, description )
-    #define FAIL( msg ) INTERNAL_CATCH_MSG( Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::Normal, "FAIL", msg )
-    #define SUCCEED( msg ) INTERNAL_CATCH_MSG( Catch::ResultWas::Ok, Catch::ResultDisposition::ContinueOnFailure, "SUCCEED", msg )
-#endif
-#define ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE( "", "" )
-
-#define REGISTER_REPORTER( name, reporterType ) INTERNAL_CATCH_REGISTER_REPORTER( name, reporterType )
-#define REGISTER_LEGACY_REPORTER( name, reporterType ) INTERNAL_CATCH_REGISTER_LEGACY_REPORTER( name, reporterType )
-
-#define GENERATE( expr) INTERNAL_CATCH_GENERATE( expr )
-
-#endif
-
-#define CATCH_TRANSLATE_EXCEPTION( signature ) INTERNAL_CATCH_TRANSLATE_EXCEPTION( signature )
-
-// "BDD-style" convenience wrappers
-#ifdef CATCH_CONFIG_VARIADIC_MACROS
-#define SCENARIO( ... ) TEST_CASE( "Scenario: " __VA_ARGS__ )
-#define SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, "Scenario: " __VA_ARGS__ )
-#else
-#define SCENARIO( name, tags ) TEST_CASE( "Scenario: " name, tags )
-#define SCENARIO_METHOD( className, name, tags ) INTERNAL_CATCH_TEST_CASE_METHOD( className, "Scenario: " name, tags )
-#endif
-#define GIVEN( desc )    SECTION( std::string("   Given: ") + desc, "" )
-#define WHEN( desc )     SECTION( std::string("    When: ") + desc, "" )
-#define AND_WHEN( desc ) SECTION( std::string("And when: ") + desc, "" )
-#define THEN( desc )     SECTION( std::string("    Then: ") + desc, "" )
-#define AND_THEN( desc ) SECTION( std::string("     And: ") + desc, "" )
-
-using Catch::Detail::Approx;
-
-#endif // TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED
-
diff --git a/src/unittests/configuration.cc b/src/unittests/configuration.cc
deleted file mode 100644
index 03561ed42..000000000
--- a/src/unittests/configuration.cc
+++ /dev/null
@@ -1,293 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2016-2017  The ManaPlus Developers
- *
- *  This file is part of The ManaPlus Client.
- *
- *  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
- *  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, see <http://www.gnu.org/licenses/>.
- */
-
-#include "unittests/unittests.h"
-
-#include "configuration.h"
-#include "configmanager.h"
-#include "dirs.h"
-
-#include "listeners/configlistener.h"
-
-#include "debug.h"
-
-namespace
-{
-    int mCalled = 0;
-
-    class TestConfigListener : public ConfigListener
-    {
-        public:
-            void optionChanged(const std::string &name) override final
-            {
-                if (name == "testkey123")
-                    mCalled ++;
-            }
-    } testListener;
-}  // namespace
-
-TEST_CASE("configuration tests", "configuration")
-{
-    Dirs::initRootDir();
-    Dirs::initHomeDir();
-
-    ConfigManager::initConfiguration();
-
-    SECTION("configuration undefined")
-    {
-        const char *const key = "nonsetvalue";
-        REQUIRE(config.getValue(key, "not set") == "not set");
-        REQUIRE(config.getValue(key, 12345) == 12345);
-        REQUIRE(config.getValue(key, 12345U) == 12345U);
-        REQUIRE(config.getValueInt(key, 12345) == 12345);
-        REQUIRE(config.getValueBool(key, false) == false);
-        REQUIRE(config.getValueBool(key, true) == true);
-        REQUIRE(config.getValue(key, -12345) == -12345);
-        REQUIRE(config.getValue(key, 12.345) > 12.3);
-    }
-
-    SECTION("configuration getint default")
-    {
-        const char *const key = "sfxVolume";
-        REQUIRE(config.getIntValue(key) == 100);
-        REQUIRE(config.getFloatValue(key) >= 100.0f);
-        REQUIRE(config.getStringValue(key) == "100");
-        REQUIRE(config.getBoolValue(key) == true);
-    }
-
-    SECTION("configuration getfloat default")
-    {
-        const char *const key = "guialpha";
-        REQUIRE(config.getIntValue(key) == 0);
-        REQUIRE(config.getFloatValue(key) >= 0.8f);
-        REQUIRE(config.getStringValue(key).substr(0, 3) == "0.8");
-        REQUIRE(config.getBoolValue(key) == false);
-    }
-
-    SECTION("configuration getstring default")
-    {
-        const char *const key = "soundwhisper";
-        REQUIRE(config.getIntValue(key) == 0);
-        REQUIRE(config.getFloatValue(key) >= 0.0f);
-        REQUIRE(config.getStringValue(key) == "newmessage");
-        REQUIRE(config.getBoolValue(key) == true);
-    }
-
-    SECTION("configuration getbool default1")
-    {
-        const char *const key = "showgender";
-        REQUIRE(config.getIntValue(key) == 1);
-        REQUIRE(config.getFloatValue(key) >= 1.0f);
-        REQUIRE(config.getStringValue(key) == "1");
-        REQUIRE(config.getBoolValue(key) == true);
-    }
-
-    SECTION("configuration getbool default2")
-    {
-        const char *const key = "showlevel";
-        REQUIRE(config.getIntValue(key) == 0);
-        REQUIRE(config.getFloatValue(key) >= 0.0f);
-        REQUIRE(config.getStringValue(key) == "0");
-        REQUIRE(config.getBoolValue(key) == false);
-    }
-
-    SECTION("configuration getint set")
-    {
-        const char *const key = "sfxVolume";
-        config.setValue(key, 50);
-        REQUIRE(config.getIntValue(key) == 50);
-        REQUIRE(config.getFloatValue(key) >= 50.0f);
-        REQUIRE(config.getStringValue(key) == "50");
-        REQUIRE(config.getBoolValue(key) == true);
-
-        REQUIRE(config.getValue(key, "not set") == "50");
-        REQUIRE(config.getValue(key, 12345) == 50);
-        REQUIRE(config.getValue(key, 12345U) == 50U);
-        REQUIRE(config.getValueInt(key, 12345) == 50);
-        REQUIRE(config.getValueBool(key, false) == true);
-        REQUIRE(config.getValueBool(key, true) == true);
-        REQUIRE(config.getValue(key, -12345) == 50);
-        REQUIRE(config.getValue(key, 12.345) >= 50.0);
-    }
-
-    SECTION("configuration getfloat set")
-    {
-        const char *const key = "guialpha";
-        config.setValue(key, 50.5);
-        REQUIRE(config.getIntValue(key) == 50);
-        REQUIRE(config.getFloatValue(key) >= 50.4f);
-        REQUIRE(config.getStringValue(key).substr(0, 2) == "50");
-        REQUIRE(config.getBoolValue(key) == true);
-
-        REQUIRE(config.getValue(key, "not set").substr(0, 2) == "50");
-        REQUIRE(config.getValue(key, 12345) == 50);
-        REQUIRE(config.getValue(key, 12345U) == 50U);
-        REQUIRE(config.getValueInt(key, 12345) == 50);
-        REQUIRE(config.getValueBool(key, false) == true);
-        REQUIRE(config.getValueBool(key, true) == true);
-        REQUIRE(config.getValue(key, -12345) == 50);
-        REQUIRE(config.getValue(key, 12.345) >= 50.4);
-    }
-
-    SECTION("configuration getstring set")
-    {
-        const char *const key = "soundwhisper";
-        config.setValue(key, "test line");
-        REQUIRE(config.getIntValue(key) == 0);
-        REQUIRE(config.getFloatValue(key) >= 0.0f);
-        REQUIRE(config.getStringValue(key) == "test line");
-        REQUIRE(config.getBoolValue(key) == false);
-
-        REQUIRE(config.getValue(key, "not set") == "test line");
-        REQUIRE(config.getValue(key, 12345) == 0);
-        REQUIRE(config.getValue(key, 12345U) == 0U);
-        REQUIRE(config.getValueInt(key, 12345) == 0);
-        REQUIRE(config.getValueBool(key, false) == false);
-        REQUIRE(config.getValueBool(key, true) == false);
-        REQUIRE(config.getValue(key, -12345) == 0);
-        REQUIRE(config.getValue(key, 12.345) >= 0.0);
-    }
-
-    SECTION("configuration getbool set1")
-    {
-        const char *const key = "showgender";
-        config.setValue(key, true);
-        REQUIRE(config.getIntValue(key) == 1);
-        REQUIRE(config.getFloatValue(key) >= 1.0f);
-        REQUIRE(config.getStringValue(key) == "1");
-        REQUIRE(config.getBoolValue(key) == true);
-
-        REQUIRE(config.getValue(key, "not set") == "1");
-        REQUIRE(config.getValue(key, 12345) == 1);
-        REQUIRE(config.getValue(key, 12345U) == 1U);
-        REQUIRE(config.getValueInt(key, 12345) == 1);
-        REQUIRE(config.getValueBool(key, false) == true);
-        REQUIRE(config.getValueBool(key, true) == true);
-        REQUIRE(config.getValue(key, -12345) == 1);
-        REQUIRE(config.getValue(key, 12.345) >= 1.0);
-    }
-
-    SECTION("configuration getbool set2")
-    {
-        const char *const key = "showgender";
-        config.setValue(key, false);
-        REQUIRE(config.getIntValue(key) == 0);
-        REQUIRE(config.getFloatValue(key) >= 0.0f);
-        REQUIRE(config.getStringValue(key) == "0");
-        REQUIRE(config.getBoolValue(key) == false);
-
-        REQUIRE(config.getValue(key, "not set") == "0");
-        REQUIRE(config.getValue(key, 12345) == 0);
-        REQUIRE(config.getValue(key, 12345U) == 0U);
-        REQUIRE(config.getValueInt(key, 12345) == 0);
-        REQUIRE(config.getValueBool(key, false) == false);
-        REQUIRE(config.getValueBool(key, true) == false);
-        REQUIRE(config.getValue(key, -12345) == 0);
-        REQUIRE(config.getValue(key, 12.345) >= 0.0);
-    }
-
-    SECTION("configuration deletekey")
-    {
-        const char *const key = "testkey123";
-        config.setValue(key, 123);
-        REQUIRE(config.getValueInt(key, 12345) == 123);
-        config.deleteKey(key);
-        REQUIRE(config.getValueInt(key, 12345) == 12345);
-    }
-
-    SECTION("configuration addlistener")
-    {
-        const char *const key = "testkey123";
-        REQUIRE(mCalled == 0);
-        config.addListener(key, &testListener);
-        REQUIRE(mCalled == 0);
-        config.setValue(key, 123);
-        REQUIRE(mCalled == 1);
-        REQUIRE(config.getValueInt(key, 12345) == 123);
-        REQUIRE(mCalled == 1);
-        config.setValue(key, 123);
-        REQUIRE(mCalled == 2);
-        config.setSilent(key, true);
-        REQUIRE(mCalled == 2);
-        REQUIRE(config.getBoolValue(key) == true);
-        REQUIRE(mCalled == 2);
-        config.setSilent(key, false);
-        REQUIRE(mCalled == 2);
-        REQUIRE(config.getBoolValue(key) == false);
-        REQUIRE(mCalled == 2);
-        config.removeListener(key, &testListener);
-    }
-
-    SECTION("configuration incvalue")
-    {
-        const char *const key = "testkey123";
-        config.setValue(key, 10);
-        REQUIRE(config.getValueInt(key, 12345) == 10);
-        config.incValue(key);
-        REQUIRE(config.getValueInt(key, 12345) == 11);
-    }
-
-    SECTION("configuration resetintvalue")
-    {
-        const char *const key = "sfxVolume";
-        config.setValue(key, 20);
-        REQUIRE(config.getIntValue(key) == 20);
-        REQUIRE(config.getFloatValue(key) >= 20.0f);
-        REQUIRE(config.getStringValue(key) == "20");
-        REQUIRE(config.getBoolValue(key) == true);
-        config.resetIntValue(key);
-        REQUIRE(config.getIntValue(key) == 100);
-        REQUIRE(config.getFloatValue(key) >= 100.0f);
-        REQUIRE(config.getStringValue(key) == "100");
-        REQUIRE(config.getBoolValue(key) == true);
-    }
-
-    SECTION("configuration resetboolvalue1")
-    {
-        const char *const key = "showgender";
-        config.setValue(key, false);
-        REQUIRE(config.getIntValue(key) == 0);
-        REQUIRE(config.getFloatValue(key) >= 0.0f);
-        REQUIRE(config.getStringValue(key) == "0");
-        REQUIRE(config.getBoolValue(key) == false);
-
-        config.resetBoolValue(key);
-        REQUIRE(config.getIntValue(key) == 1);
-        REQUIRE(config.getFloatValue(key) >= 1.0f);
-        REQUIRE(config.getStringValue(key) == "1");
-        REQUIRE(config.getBoolValue(key) == true);
-    }
-
-    SECTION("configuration resetboolvalue2")
-    {
-        const char *const key = "showlevel";
-        config.setValue(key, true);
-        REQUIRE(config.getIntValue(key) == 1);
-        REQUIRE(config.getFloatValue(key) >= 1.0f);
-        REQUIRE(config.getStringValue(key) == "1");
-        REQUIRE(config.getBoolValue(key) == true);
-
-        config.resetBoolValue(key);
-        REQUIRE(config.getIntValue(key) == 0);
-        REQUIRE(config.getFloatValue(key) >= 0.0f);
-        REQUIRE(config.getStringValue(key) == "0");
-        REQUIRE(config.getBoolValue(key) == false);
-    }
-}
diff --git a/src/unittests/doctest.h b/src/unittests/doctest.h
deleted file mode 100644
index 10ecf5158..000000000
--- a/src/unittests/doctest.h
+++ /dev/null
@@ -1,5613 +0,0 @@
-// ======================================================================
-// == DO NOT MODIFY THIS FILE BY HAND - IT IS AUTO GENERATED BY CMAKE! ==
-// ======================================================================
-//
-// doctest.h - the lightest feature-rich C++ single-header testing framework for unit tests and TDD
-//
-// Copyright (c) 2016-2017 Viktor Kirilov
-//
-// Distributed under the MIT Software License
-// See accompanying file LICENSE.txt or copy at
-// https://opensource.org/licenses/MIT
-//
-// The documentation can be found at the library's page:
-// https://github.com/onqtam/doctest/blob/master/doc/markdown/readme.md
-//
-// =================================================================================================
-// =================================================================================================
-// =================================================================================================
-//
-// The library is heavily influenced by Catch - https://github.com/philsquared/Catch
-// which uses the Boost Software License - Version 1.0
-// see here - https://github.com/philsquared/Catch/blob/master/LICENSE_1_0.txt
-//
-// The concept of subcases (sections in Catch) and expression decomposition are from there.
-// Some parts of the code are taken directly:
-// - stringification - the detection of "ostream& operator<<(ostream&, const T&)" and StringMaker<>
-// - the Approx() helper class for floating point comparison
-// - colors in the console
-// - breaking into a debugger
-// - signal / SEH handling
-// - timer
-//
-// The expression decomposing templates are taken from lest - https://github.com/martinmoene/lest
-// which uses the Boost Software License - Version 1.0
-// see here - https://github.com/martinmoene/lest/blob/master/LICENSE_1_0.txt
-//
-// The type list and the foreach algorithm on it for C++98 are taken from Loki
-// - http://loki-lib.sourceforge.net/
-// - https://en.wikipedia.org/wiki/Loki_%28C%2B%2B%29
-// - https://github.com/snaewe/loki-lib
-// which uses the MIT Software License
-//
-// =================================================================================================
-// =================================================================================================
-// =================================================================================================
-
-// Suppress this globally (without push/pop) - there is no way to silence it in the
-// expression decomposition macros _Pragma() in macros doesn't work for the c++ front-end of g++
-// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=55578
-// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=69543
-// Also the warning is completely worthless nowadays - http://stackoverflow.com/questions/14016993
-#if defined(__GNUC__) && !defined(__clang__)
-#pragma GCC diagnostic ignored "-Waggregate-return"
-#endif
-
-#if defined(__clang__)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunknown-pragmas"
-#pragma clang diagnostic ignored "-Wnon-virtual-dtor"
-#pragma clang diagnostic ignored "-Wweak-vtables"
-#pragma clang diagnostic ignored "-Wpadded"
-#pragma clang diagnostic ignored "-Wdeprecated"
-#pragma clang diagnostic ignored "-Wmissing-prototypes"
-#pragma clang diagnostic ignored "-Wunused-local-typedef"
-#pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant"
-#pragma clang diagnostic ignored "-Wc++11-long-long"
-#endif // __clang__
-
-#if defined(__GNUC__) && !defined(__clang__)
-#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 6)
-#pragma GCC diagnostic push
-#endif // > gcc 4.6
-#pragma GCC diagnostic ignored "-Wunknown-pragmas"
-#pragma GCC diagnostic ignored "-Weffc++"
-#pragma GCC diagnostic ignored "-Wstrict-overflow"
-#pragma GCC diagnostic ignored "-Wstrict-aliasing"
-#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
-#pragma GCC diagnostic ignored "-Wmissing-declarations"
-#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
-#pragma GCC diagnostic ignored "-Winline"
-#pragma GCC diagnostic ignored "-Wlong-long"
-#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 6)
-#pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant"
-#endif // > gcc 4.6
-#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 7)
-#pragma GCC diagnostic ignored "-Wunused-local-typedefs"
-#endif // > gcc 4.7
-#if __GNUC__ > 5 || (__GNUC__ == 5 && __GNUC_MINOR__ > 3)
-#pragma GCC diagnostic ignored "-Wuseless-cast"
-#endif // > gcc 5.3
-#endif // __GNUC__
-
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable : 4996) // The compiler encountered a deprecated declaration
-#pragma warning(disable : 4706) // assignment within conditional expression
-#pragma warning(disable : 4512) // 'class' : assignment operator could not be generated
-#pragma warning(disable : 4127) // conditional expression is constant
-#endif                          // _MSC_VER
-
-#ifndef DOCTEST_LIBRARY_INCLUDED
-#define DOCTEST_LIBRARY_INCLUDED
-
-#define DOCTEST_VERSION_MAJOR 1
-#define DOCTEST_VERSION_MINOR 2
-#define DOCTEST_VERSION_PATCH 1
-#define DOCTEST_VERSION_STR "1.2.1"
-
-#define DOCTEST_VERSION                                                                            \
-    (DOCTEST_VERSION_MAJOR * 10000 + DOCTEST_VERSION_MINOR * 100 + DOCTEST_VERSION_PATCH)
-
-// =================================================================================================
-// == FEATURE DETECTION ============================================================================
-// =================================================================================================
-
-#if __cplusplus >= 201103L
-#ifndef DOCTEST_CONFIG_WITH_DELETED_FUNCTIONS
-#define DOCTEST_CONFIG_WITH_DELETED_FUNCTIONS
-#endif // DOCTEST_CONFIG_WITH_DELETED_FUNCTIONS
-#ifndef DOCTEST_CONFIG_WITH_RVALUE_REFERENCES
-#define DOCTEST_CONFIG_WITH_RVALUE_REFERENCES
-#endif // DOCTEST_CONFIG_WITH_RVALUE_REFERENCES
-#ifndef DOCTEST_CONFIG_WITH_NULLPTR
-#define DOCTEST_CONFIG_WITH_NULLPTR
-#endif // DOCTEST_CONFIG_WITH_NULLPTR
-#ifndef DOCTEST_CONFIG_WITH_LONG_LONG
-#define DOCTEST_CONFIG_WITH_LONG_LONG
-#endif // DOCTEST_CONFIG_WITH_LONG_LONG
-#ifndef DOCTEST_CONFIG_WITH_STATIC_ASSERT
-#define DOCTEST_CONFIG_WITH_STATIC_ASSERT
-#endif // DOCTEST_CONFIG_WITH_STATIC_ASSERT
-#ifndef DOCTEST_CONFIG_WITH_VARIADIC_MACROS
-#define DOCTEST_CONFIG_WITH_VARIADIC_MACROS
-#endif // DOCTEST_CONFIG_WITH_VARIADIC_MACROS
-#endif // __cplusplus >= 201103L
-
-#ifndef __has_feature
-#define __has_feature(x) 0
-#endif // __has_feature
-
-// MSVC C++11 feature support table: https://msdn.microsoft.com/en-us/library/hh567368.aspx
-// GCC C++11 feature support table: https://gcc.gnu.org/projects/cxx-status.html
-// MSVC version table:
-// MSVC++ 15.0 _MSC_VER == 1910 (Visual Studio 2017)
-// MSVC++ 14.0 _MSC_VER == 1900 (Visual Studio 2015)
-// MSVC++ 12.0 _MSC_VER == 1800 (Visual Studio 2013)
-// MSVC++ 11.0 _MSC_VER == 1700 (Visual Studio 2012)
-// MSVC++ 10.0 _MSC_VER == 1600 (Visual Studio 2010)
-// MSVC++ 9.0  _MSC_VER == 1500 (Visual Studio 2008)
-// MSVC++ 8.0  _MSC_VER == 1400 (Visual Studio 2005)
-
-// deleted functions
-
-#ifndef DOCTEST_CONFIG_WITH_DELETED_FUNCTIONS
-#if defined(_MSC_VER) && (_MSC_VER >= 1800)
-#define DOCTEST_CONFIG_WITH_DELETED_FUNCTIONS
-#endif // _MSC_VER
-#if defined(__clang__) && __has_feature(cxx_deleted_functions)
-#define DOCTEST_CONFIG_WITH_DELETED_FUNCTIONS
-#endif // __clang__
-#if defined(__GNUC__) && ((__GNUC__ == 4 && __GNUC_MINOR__ >= 4) || __GNUC__ > 4) &&               \
-        defined(__GXX_EXPERIMENTAL_CXX0X__)
-#define DOCTEST_CONFIG_WITH_DELETED_FUNCTIONS
-#endif // __GNUC__
-#endif // DOCTEST_CONFIG_WITH_DELETED_FUNCTIONS
-
-#if defined(DOCTEST_CONFIG_NO_DELETED_FUNCTIONS) && defined(DOCTEST_CONFIG_WITH_DELETED_FUNCTIONS)
-#undef DOCTEST_CONFIG_WITH_DELETED_FUNCTIONS
-#endif // DOCTEST_CONFIG_NO_DELETED_FUNCTIONS
-
-// rvalue references
-
-#ifndef DOCTEST_CONFIG_WITH_RVALUE_REFERENCES
-#if defined(_MSC_VER) && (_MSC_VER >= 1600)
-#define DOCTEST_CONFIG_WITH_RVALUE_REFERENCES
-#endif // _MSC_VER
-#if defined(__clang__) && __has_feature(cxx_rvalue_references)
-#define DOCTEST_CONFIG_WITH_RVALUE_REFERENCES
-#endif // __clang__
-#if defined(__GNUC__) && ((__GNUC__ == 4 && __GNUC_MINOR__ >= 3) || __GNUC__ > 4) &&               \
-        defined(__GXX_EXPERIMENTAL_CXX0X__)
-#define DOCTEST_CONFIG_WITH_RVALUE_REFERENCES
-#endif // __GNUC__
-#endif // DOCTEST_CONFIG_WITH_RVALUE_REFERENCES
-
-#if defined(DOCTEST_CONFIG_NO_RVALUE_REFERENCES) && defined(DOCTEST_CONFIG_WITH_RVALUE_REFERENCES)
-#undef DOCTEST_CONFIG_WITH_RVALUE_REFERENCES
-#endif // DOCTEST_CONFIG_NO_RVALUE_REFERENCES
-
-// nullptr
-
-#ifndef DOCTEST_CONFIG_WITH_NULLPTR
-#if defined(__clang__) && __has_feature(cxx_nullptr)
-#define DOCTEST_CONFIG_WITH_NULLPTR
-#endif // __clang__
-#if defined(__GNUC__) && ((__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || __GNUC__ > 4) &&               \
-        defined(__GXX_EXPERIMENTAL_CXX0X__)
-#define DOCTEST_CONFIG_WITH_NULLPTR
-#endif                                      // __GNUC__
-#if defined(_MSC_VER) && (_MSC_VER >= 1600) // MSVC 2010
-#define DOCTEST_CONFIG_WITH_NULLPTR
-#endif // _MSC_VER
-#endif // DOCTEST_CONFIG_WITH_NULLPTR
-
-#if defined(DOCTEST_CONFIG_NO_NULLPTR) && defined(DOCTEST_CONFIG_WITH_NULLPTR)
-#undef DOCTEST_CONFIG_WITH_NULLPTR
-#endif // DOCTEST_CONFIG_NO_NULLPTR
-
-// variadic macros
-
-#ifndef DOCTEST_CONFIG_WITH_VARIADIC_MACROS
-#if defined(_MSC_VER) && _MSC_VER > 1400 && !defined(__EDGE__)
-#define DOCTEST_CONFIG_WITH_VARIADIC_MACROS
-#endif // _MSC_VER
-#if defined(__GNUC__) && ((__GNUC__ == 4 && __GNUC_MINOR__ >= 1) || __GNUC__ > 4) &&               \
-        defined(__GXX_EXPERIMENTAL_CXX0X__)
-#define DOCTEST_CONFIG_WITH_VARIADIC_MACROS
-#endif // __GNUC__ and clang
-#endif // DOCTEST_CONFIG_WITH_VARIADIC_MACROS
-
-#if defined(DOCTEST_CONFIG_NO_VARIADIC_MACROS) && defined(DOCTEST_CONFIG_WITH_VARIADIC_MACROS)
-#undef DOCTEST_CONFIG_WITH_VARIADIC_MACROS
-#endif // DOCTEST_CONFIG_NO_VARIADIC_MACROS
-
-// long long
-
-#ifndef DOCTEST_CONFIG_WITH_LONG_LONG
-#if defined(_MSC_VER) && (_MSC_VER >= 1400)
-#define DOCTEST_CONFIG_WITH_LONG_LONG
-#endif // _MSC_VER
-#if(defined(__clang__) ||                                                                          \
-    (defined(__GNUC__) && ((__GNUC__ == 4 && __GNUC_MINOR__ >= 5) || __GNUC__ > 4))) &&            \
-        defined(__GXX_EXPERIMENTAL_CXX0X__)
-#define DOCTEST_CONFIG_WITH_LONG_LONG
-#endif // __GNUC__ and clang
-#endif // DOCTEST_CONFIG_WITH_LONG_LONG
-
-#if defined(DOCTEST_CONFIG_NO_LONG_LONG) && defined(DOCTEST_CONFIG_WITH_LONG_LONG)
-#undef DOCTEST_CONFIG_WITH_LONG_LONG
-#endif // DOCTEST_CONFIG_NO_LONG_LONG
-
-// static_assert
-
-#ifndef DOCTEST_CONFIG_WITH_STATIC_ASSERT
-#if defined(__clang__) && __has_feature(cxx_static_assert)
-#define DOCTEST_CONFIG_WITH_STATIC_ASSERT
-#endif // __clang__
-#if defined(__GNUC__) && ((__GNUC__ == 4 && __GNUC_MINOR__ >= 3) || __GNUC__ > 4) &&               \
-        defined(__GXX_EXPERIMENTAL_CXX0X__)
-#define DOCTEST_CONFIG_WITH_STATIC_ASSERT
-#endif                                      // __GNUC__
-#if defined(_MSC_VER) && (_MSC_VER >= 1600) // MSVC 2010
-#define DOCTEST_CONFIG_WITH_STATIC_ASSERT
-#endif // _MSC_VER
-#endif // DOCTEST_CONFIG_WITH_STATIC_ASSERT
-
-#if defined(DOCTEST_CONFIG_NO_STATIC_ASSERT) && defined(DOCTEST_CONFIG_WITH_STATIC_ASSERT)
-#undef DOCTEST_CONFIG_WITH_STATIC_ASSERT
-#endif // DOCTEST_CONFIG_NO_STATIC_ASSERT
-
-// other stuff...
-
-#if defined(DOCTEST_CONFIG_WITH_RVALUE_REFERENCES) || defined(DOCTEST_CONFIG_WITH_LONG_LONG) ||    \
-        defined(DOCTEST_CONFIG_WITH_DELETED_FUNCTIONS) || defined(DOCTEST_CONFIG_WITH_NULLPTR) ||  \
-        defined(DOCTEST_CONFIG_WITH_VARIADIC_MACROS) || defined(DOCTEST_CONFIG_WITH_STATIC_ASSERT)
-#define DOCTEST_NO_CPP11_COMPAT
-#endif // c++11 stuff
-
-#if defined(__clang__) && defined(DOCTEST_NO_CPP11_COMPAT)
-#pragma clang diagnostic ignored "-Wc++98-compat"
-#pragma clang diagnostic ignored "-Wc++98-compat-pedantic"
-#endif // __clang__ && DOCTEST_NO_CPP11_COMPAT
-
-#if defined(_MSC_VER) && !defined(DOCTEST_CONFIG_WINDOWS_SEH)
-#define DOCTEST_CONFIG_WINDOWS_SEH
-#endif // _MSC_VER
-#if defined(DOCTEST_CONFIG_NO_WINDOWS_SEH) && defined(DOCTEST_CONFIG_WINDOWS_SEH)
-#undef DOCTEST_CONFIG_WINDOWS_SEH
-#endif // DOCTEST_CONFIG_NO_WINDOWS_SEH
-
-#if !defined(_WIN32) && !defined(__QNX__) && !defined(DOCTEST_CONFIG_POSIX_SIGNALS)
-#define DOCTEST_CONFIG_POSIX_SIGNALS
-#endif // _WIN32
-#if defined(DOCTEST_CONFIG_NO_POSIX_SIGNALS) && defined(DOCTEST_CONFIG_POSIX_SIGNALS)
-#undef DOCTEST_CONFIG_POSIX_SIGNALS
-#endif // DOCTEST_CONFIG_NO_POSIX_SIGNALS
-
-#ifndef DOCTEST_CONFIG_NO_EXCEPTIONS
-#if defined(__GNUC__) && !defined(__EXCEPTIONS)
-#define DOCTEST_CONFIG_NO_EXCEPTIONS
-#endif // clang and gcc
-// in MSVC _HAS_EXCEPTIONS is defined in a header instead of as a project define
-// so we can't do the automatic detection for MSVC without including some header
-#endif // DOCTEST_CONFIG_NO_EXCEPTIONS
-
-#ifdef DOCTEST_CONFIG_NO_EXCEPTIONS_BUT_WITH_ALL_ASSERTS
-#ifndef DOCTEST_CONFIG_NO_EXCEPTIONS
-#define DOCTEST_CONFIG_NO_EXCEPTIONS
-#endif // DOCTEST_CONFIG_NO_EXCEPTIONS
-#endif // DOCTEST_CONFIG_NO_EXCEPTIONS_BUT_WITH_ALL_ASSERTS
-
-#if defined(DOCTEST_CONFIG_NO_EXCEPTIONS) && !defined(DOCTEST_CONFIG_NO_TRY_CATCH_IN_ASSERTS)
-#define DOCTEST_CONFIG_NO_TRY_CATCH_IN_ASSERTS
-#endif // DOCTEST_CONFIG_NO_EXCEPTIONS && !DOCTEST_CONFIG_NO_TRY_CATCH_IN_ASSERTS
-
-#if defined(DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN) && !defined(DOCTEST_CONFIG_IMPLEMENT)
-#define DOCTEST_CONFIG_IMPLEMENT
-#endif // DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
-
-#if defined _WIN32 || defined __CYGWIN__
-#ifdef __GNUC__
-#define DOCTEST_SYMBOL_EXPORT __attribute__((dllexport))
-#define DOCTEST_SYMBOL_IMPORT __attribute__((dllimport))
-#else // __GNUC__
-#define DOCTEST_SYMBOL_EXPORT __declspec(dllexport)
-#define DOCTEST_SYMBOL_IMPORT __declspec(dllimport)
-#endif // __GNUC__
-#else  // _WIN32
-#define DOCTEST_SYMBOL_EXPORT __attribute__((visibility("default")))
-#define DOCTEST_SYMBOL_IMPORT
-#endif // _WIN32
-
-#ifdef DOCTEST_CONFIG_IMPLEMENTATION_IN_DLL
-#ifdef DOCTEST_CONFIG_IMPLEMENT
-#define DOCTEST_INTERFACE DOCTEST_SYMBOL_EXPORT
-#else // DOCTEST_CONFIG_IMPLEMENT
-#define DOCTEST_INTERFACE DOCTEST_SYMBOL_IMPORT
-#endif // DOCTEST_CONFIG_IMPLEMENT
-#else  // DOCTEST_CONFIG_IMPLEMENTATION_IN_DLL
-#define DOCTEST_INTERFACE
-#endif // DOCTEST_CONFIG_IMPLEMENTATION_IN_DLL
-
-#ifdef _MSC_VER
-#define DOCTEST_NOINLINE __declspec(noinline)
-#else // _MSC_VER
-#define DOCTEST_NOINLINE __attribute__((noinline))
-#endif // _MSC_VER
-
-#ifndef DOCTEST_CONFIG_NUM_CAPTURES_ON_STACK
-#define DOCTEST_CONFIG_NUM_CAPTURES_ON_STACK 5
-#endif // DOCTEST_CONFIG_NUM_CAPTURES_ON_STACK
-
-// =================================================================================================
-// == FEATURE DETECTION END ========================================================================
-// =================================================================================================
-
-// internal macros for string concatenation and anonymous variable name generation
-#define DOCTEST_CAT_IMPL(s1, s2) s1##s2
-#define DOCTEST_CAT(s1, s2) DOCTEST_CAT_IMPL(s1, s2)
-#ifdef __COUNTER__ // not standard and may be missing for some compilers
-#define DOCTEST_ANONYMOUS(x) DOCTEST_CAT(x, __COUNTER__)
-#else // __COUNTER__
-#define DOCTEST_ANONYMOUS(x) DOCTEST_CAT(x, __LINE__)
-#endif // __COUNTER__
-
-// macro for making a string out of an identifier
-#ifdef DOCTEST_CONFIG_WITH_VARIADIC_MACROS
-#define DOCTEST_TOSTR_IMPL(...) #__VA_ARGS__
-#define DOCTEST_TOSTR(...) DOCTEST_TOSTR_IMPL(__VA_ARGS__)
-#else // DOCTEST_CONFIG_WITH_VARIADIC_MACROS
-#define DOCTEST_TOSTR_IMPL(x) #x
-#define DOCTEST_TOSTR(x) DOCTEST_TOSTR_IMPL(x)
-#endif // DOCTEST_CONFIG_WITH_VARIADIC_MACROS
-
-// for concatenating literals and making the result a string
-#define DOCTEST_STR_CONCAT_TOSTR(s1, s2) DOCTEST_TOSTR(s1) DOCTEST_TOSTR(s2)
-
-// counts the number of elements in a C string
-#define DOCTEST_COUNTOF(x) (sizeof(x) / sizeof(x[0]))
-
-#ifndef DOCTEST_CONFIG_ASSERTION_PARAMETERS_BY_VALUE
-#define DOCTEST_REF_WRAP(x) x&
-#else // DOCTEST_CONFIG_ASSERTION_PARAMETERS_BY_VALUE
-#define DOCTEST_REF_WRAP(x) x
-#endif // DOCTEST_CONFIG_ASSERTION_PARAMETERS_BY_VALUE
-
-// not using __APPLE__ because... this is how Catch does it
-#if defined(__MAC_OS_X_VERSION_MIN_REQUIRED)
-#define DOCTEST_PLATFORM_MAC
-#elif defined(__IPHONE_OS_VERSION_MIN_REQUIRED)
-#define DOCTEST_PLATFORM_IPHONE
-#elif defined(_WIN32) || defined(_MSC_VER)
-#define DOCTEST_PLATFORM_WINDOWS
-#else
-#define DOCTEST_PLATFORM_LINUX
-#endif
-
-#if defined(__clang__)
-#define DOCTEST_GLOBAL_NO_WARNINGS(var)                                                            \
-    _Pragma("clang diagnostic push")                                                               \
-            _Pragma("clang diagnostic ignored \"-Wglobal-constructors\"") static int var
-#define DOCTEST_GLOBAL_NO_WARNINGS_END() _Pragma("clang diagnostic pop")
-#elif defined(__GNUC__)
-#define DOCTEST_GLOBAL_NO_WARNINGS(var) static int var __attribute__((unused))
-#define DOCTEST_GLOBAL_NO_WARNINGS_END()
-#else // MSVC / other
-#define DOCTEST_GLOBAL_NO_WARNINGS(var) static int var
-#define DOCTEST_GLOBAL_NO_WARNINGS_END()
-#endif // MSVC / other
-
-// should probably take a look at https://github.com/scottt/debugbreak
-#ifdef DOCTEST_PLATFORM_MAC
-#define DOCTEST_BREAK_INTO_DEBUGGER() __asm__("int $3\n" : :)
-#elif defined(_MSC_VER)
-#define DOCTEST_BREAK_INTO_DEBUGGER() __debugbreak()
-#elif defined(__MINGW32__)
-extern "C" __declspec(dllimport) void __stdcall DebugBreak();
-#define DOCTEST_BREAK_INTO_DEBUGGER() ::DebugBreak()
-#else // linux
-#define DOCTEST_BREAK_INTO_DEBUGGER() ((void)0)
-#endif // linux
-
-#ifdef __clang__
-// to detect if libc++ is being used with clang (the _LIBCPP_VERSION identifier)
-#include <ciso646>
-#endif // __clang__
-
-#ifdef _LIBCPP_VERSION
-// not forward declaring ostream for libc++ because I had some problems (inline namespaces vs c++98)
-// so the <iosfwd> header is used - also it is very light and doesn't drag a ton of stuff
-#include <iosfwd>
-#else // _LIBCPP_VERSION
-#ifndef DOCTEST_CONFIG_USE_IOSFWD
-namespace std
-{
-template <class charT>
-struct char_traits;
-template <>
-struct char_traits<char>;
-template <class charT, class traits>
-class basic_ostream;
-typedef basic_ostream<char, char_traits<char> > ostream;
-} // namespace std
-#else // DOCTEST_CONFIG_USE_IOSFWD
-#include <iosfwd>
-#endif // DOCTEST_CONFIG_USE_IOSFWD
-#endif // _LIBCPP_VERSION
-
-// static assert macro - because of the c++98 support requires that the message is an
-// identifier (no spaces and not a C string) - example without quotes: I_am_a_message
-// taken from here: http://stackoverflow.com/a/1980156/3162383
-#ifdef DOCTEST_CONFIG_WITH_STATIC_ASSERT
-#define DOCTEST_STATIC_ASSERT(expression, message) static_assert(expression, #message)
-#else // DOCTEST_CONFIG_WITH_STATIC_ASSERT
-#define DOCTEST_STATIC_ASSERT(expression, message)                                                 \
-    struct DOCTEST_CAT(__static_assertion_at_line_, __LINE__)                                      \
-    {                                                                                              \
-        doctest::detail::static_assert_impl::StaticAssertion<static_cast<bool>((expression))>      \
-                DOCTEST_CAT(DOCTEST_CAT(DOCTEST_CAT(STATIC_ASSERTION_FAILED_AT_LINE_, __LINE__),   \
-                                        _),                                                        \
-                            message);                                                              \
-    };                                                                                             \
-    typedef doctest::detail::static_assert_impl::StaticAssertionTest<static_cast<int>(             \
-            sizeof(DOCTEST_CAT(__static_assertion_at_line_, __LINE__)))>                           \
-            DOCTEST_CAT(__static_assertion_test_at_line_, __LINE__)
-#endif // DOCTEST_CONFIG_WITH_STATIC_ASSERT
-
-#ifdef DOCTEST_CONFIG_WITH_NULLPTR
-#ifdef _LIBCPP_VERSION
-#include <cstddef>
-#else  // _LIBCPP_VERSION
-namespace std
-{ typedef decltype(nullptr) nullptr_t; }
-#endif // _LIBCPP_VERSION
-#endif // DOCTEST_CONFIG_WITH_NULLPTR
-
-#ifndef DOCTEST_CONFIG_DISABLE
-
-#ifdef DOCTEST_CONFIG_INCLUDE_TYPE_TRAITS
-#include <type_traits>
-#endif // DOCTEST_CONFIG_INCLUDE_TYPE_TRAITS
-
-namespace doctest
-{
-namespace detail
-{
-    struct TestSuite
-    {
-        const char* m_test_suite;
-        const char* m_description;
-        bool        m_skip;
-        bool        m_may_fail;
-        bool        m_should_fail;
-        int         m_expected_failures;
-        double      m_timeout;
-
-        TestSuite& operator*(const char* in) {
-            m_test_suite = in;
-            // clear state
-            m_description       = 0;
-            m_skip              = false;
-            m_may_fail          = false;
-            m_should_fail       = false;
-            m_expected_failures = 0;
-            m_timeout           = 0;
-            return *this;
-        }
-
-        template <typename T>
-        TestSuite& operator*(const T& in) {
-            in.fill(*this);
-            return *this;
-        }
-    };
-} // namespace detail
-} // namespace doctest
-
-// in a separate namespace outside of doctest because the DOCTEST_TEST_SUITE macro
-// introduces an anonymous namespace in which getCurrentTestSuite gets overridden
-namespace doctest_detail_test_suite_ns
-{
-DOCTEST_INTERFACE doctest::detail::TestSuite& getCurrentTestSuite();
-} // namespace doctest_detail_test_suite_ns
-
-#endif // DOCTEST_CONFIG_DISABLE
-
-namespace doctest
-{
-// A 24 byte string class (can be as small as 17 for x64 and 13 for x86) that can hold strings with length
-// of up to 23 chars on the stack before going on the heap - the last byte of the buffer is used for:
-// - "is small" bit - the highest bit - if "0" then it is small - otherwise its "1" (128)
-// - if small - capacity left before going on the heap - using the lowest 5 bits
-// - if small - 2 bits are left unused - the second and third highest ones
-// - if small - acts as a null terminator if strlen() is 23 (24 including the null terminator)
-//              and the "is small" bit remains "0" ("as well as the capacity left") so its OK
-// Idea taken from this lecture about the string implementation of facebook/folly - fbstring
-// https://www.youtube.com/watch?v=kPR8h4-qZdk
-// TODO:
-// - optimizations - like not deleting memory unnecessarily in operator= and etc.
-// - resize/reserve/clear
-// - substr
-// - replace
-// - back/front
-// - iterator stuff
-// - find & friends
-// - push_back/pop_back
-// - assign/insert/erase
-// - relational operators as free functions - taking const char* as one of the params
-class DOCTEST_INTERFACE String
-{
-    static const unsigned len  = 24;      //!OCLINT avoid private static members
-    static const unsigned last = len - 1; //!OCLINT avoid private static members
-
-    struct view // len should be more than sizeof(view) - because of the final byte for flags
-    {
-        char*    ptr;
-        unsigned size;
-        unsigned capacity;
-    };
-
-    union
-    {
-        char buf[len];
-        view data;
-    };
-
-    void copy(const String& other);
-
-    void setOnHeap() { *reinterpret_cast<unsigned char*>(&buf[last]) = 128; }
-    void setLast(unsigned in = last) { buf[last] = char(in); }
-
-public:
-    String() {
-        buf[0] = '\0';
-        setLast();
-    }
-
-    String(const char* in);
-
-    String(const String& other) { copy(other); }
-
-    ~String() {
-        if(!isOnStack())
-            delete[] data.ptr;
-    }
-
-    // GCC 4.9/5/6 report Wstrict-overflow when optimizations are ON and it got inlined in the vector class somewhere...
-    // see commit 574ef95f0cd379118be5011704664e4b5351f1e0 and build https://travis-ci.org/onqtam/doctest/builds/230671611
-    DOCTEST_NOINLINE String& operator=(const String& other) {
-        if(this != &other) {
-            if(!isOnStack())
-                delete[] data.ptr;
-
-            copy(other);
-        }
-
-        return *this;
-    }
-    String& operator+=(const String& other);
-
-    String operator+(const String& other) const { return String(*this) += other; }
-
-#ifdef DOCTEST_CONFIG_WITH_RVALUE_REFERENCES
-    String(String&& other);
-    String& operator=(String&& other);
-#endif // DOCTEST_CONFIG_WITH_RVALUE_REFERENCES
-
-    bool isOnStack() const { return (buf[last] & 128) == 0; }
-
-    char operator[](unsigned i) const { return const_cast<String*>(this)->operator[](i); } // NOLINT
-    char& operator[](unsigned i) {
-        if(isOnStack())
-            return reinterpret_cast<char*>(buf)[i];
-        return data.ptr[i];
-    }
-
-    const char* c_str() const { return const_cast<String*>(this)->c_str(); } // NOLINT
-    char*       c_str() {
-        if(isOnStack())
-            return reinterpret_cast<char*>(buf);
-        return data.ptr;
-    }
-
-    unsigned size() const {
-        if(isOnStack())
-            return last - (unsigned(buf[last]) & 31); // using "last" would work only if "len" is 32
-        return data.size;
-    }
-
-    unsigned capacity() const {
-        if(isOnStack())
-            return len;
-        return data.capacity;
-    }
-
-    int compare(const char* other, bool no_case = false) const;
-    int compare(const String& other, bool no_case = false) const;
-};
-
-// clang-format off
-inline bool operator==(const String& lhs, const String& rhs) { return lhs.compare(rhs) == 0; }
-inline bool operator!=(const String& lhs, const String& rhs) { return lhs.compare(rhs) != 0; }
-inline bool operator< (const String& lhs, const String& rhs) { return lhs.compare(rhs) < 0; }
-inline bool operator> (const String& lhs, const String& rhs) { return lhs.compare(rhs) > 0; }
-inline bool operator<=(const String& lhs, const String& rhs) { return (lhs != rhs) ? lhs.compare(rhs) < 0 : true; }
-inline bool operator>=(const String& lhs, const String& rhs) { return (lhs != rhs) ? lhs.compare(rhs) > 0 : true; }
-// clang-format on
-
-DOCTEST_INTERFACE std::ostream& operator<<(std::ostream& stream, const String& in);
-
-namespace detail
-{
-#ifndef DOCTEST_CONFIG_WITH_STATIC_ASSERT
-    namespace static_assert_impl
-    {
-        template <bool>
-        struct StaticAssertion;
-
-        template <>
-        struct StaticAssertion<true>
-        {};
-
-        template <int i>
-        struct StaticAssertionTest
-        {};
-    }  // namespace static_assert_impl
-#endif // DOCTEST_CONFIG_WITH_STATIC_ASSERT
-
-    template <bool CONDITION, typename TYPE = void>
-    struct enable_if
-    {};
-
-    template <typename TYPE>
-    struct enable_if<true, TYPE>
-    { typedef TYPE type; };
-
-    template <typename T>
-    struct deferred_false
-    // cppcheck-suppress unusedStructMember
-    { static const bool value = false; };
-
-    // to silence the warning "-Wzero-as-null-pointer-constant" only for gcc 5 for the Approx template ctor - pragmas don't work for it...
-    inline void* getNull() { return 0; }
-
-    namespace has_insertion_operator_impl
-    {
-        typedef char no;
-        typedef char yes[2];
-
-        struct any_t
-        {
-            template <typename T>
-            // cppcheck-suppress noExplicitConstructor
-            any_t(const DOCTEST_REF_WRAP(T));
-        };
-
-        yes& testStreamable(std::ostream&);
-        no   testStreamable(no);
-
-        no operator<<(const std::ostream&, const any_t&);
-
-        template <typename T>
-        struct has_insertion_operator
-        {
-            static std::ostream& s;
-            static const DOCTEST_REF_WRAP(T) t;
-            static const bool value = sizeof(testStreamable(s << t)) == sizeof(yes);
-        };
-    } // namespace has_insertion_operator_impl
-
-    template <typename T>
-    struct has_insertion_operator : has_insertion_operator_impl::has_insertion_operator<T>
-    {};
-
-    DOCTEST_INTERFACE void my_memcpy(void* dest, const void* src, unsigned num);
-    DOCTEST_INTERFACE unsigned my_strlen(const char* in);
-
-    DOCTEST_INTERFACE std::ostream* createStream();
-    DOCTEST_INTERFACE String getStreamResult(std::ostream*);
-    DOCTEST_INTERFACE void   freeStream(std::ostream*);
-
-    template <bool C>
-    struct StringMakerBase
-    {
-        template <typename T>
-        static String convert(const DOCTEST_REF_WRAP(T)) {
-            return "{?}";
-        }
-    };
-
-    template <>
-    struct StringMakerBase<true>
-    {
-        template <typename T>
-        static String convert(const DOCTEST_REF_WRAP(T) in) {
-            std::ostream* stream = createStream();
-            *stream << in;
-            String result = getStreamResult(stream);
-            freeStream(stream);
-            return result;
-        }
-    };
-
-    DOCTEST_INTERFACE String rawMemoryToString(const void* object, unsigned size);
-
-    template <typename T>
-    String rawMemoryToString(const DOCTEST_REF_WRAP(T) object) {
-        return rawMemoryToString(&object, sizeof(object));
-    }
-
-    class NullType
-    {};
-
-    template <class T, class U>
-    struct Typelist
-    {
-        typedef T Head;
-        typedef U Tail;
-    };
-
-    // type of recursive function
-    template <class TList, class Callable>
-    struct ForEachType;
-
-    // Recursion rule
-    template <class Head, class Tail, class Callable>
-    struct ForEachType<Typelist<Head, Tail>, Callable> : public ForEachType<Tail, Callable>
-    {
-        enum
-        {
-            value = 1 + ForEachType<Tail, Callable>::value
-        };
-
-        explicit ForEachType(Callable& callable)
-                : ForEachType<Tail, Callable>(callable) {
-#if defined(_MSC_VER) && _MSC_VER <= 1900
-            callable.operator()<value, Head>();
-#else  // _MSC_VER
-            callable.template operator()<value, Head>();
-#endif // _MSC_VER
-        }
-    };
-
-    // Recursion end
-    template <class Head, class Callable>
-    struct ForEachType<Typelist<Head, NullType>, Callable>
-    {
-    public:
-        enum
-        {
-            value = 0
-        };
-
-        explicit ForEachType(Callable& callable) {
-#if defined(_MSC_VER) && _MSC_VER <= 1900
-            callable.operator()<value, Head>();
-#else  // _MSC_VER
-            callable.template operator()<value, Head>();
-#endif // _MSC_VER
-        }
-    };
-
-    template <typename T>
-    const char* type_to_string() {
-        return "<>";
-    }
-} // namespace detail
-
-template <typename T1 = detail::NullType, typename T2 = detail::NullType,
-          typename T3 = detail::NullType, typename T4 = detail::NullType,
-          typename T5 = detail::NullType, typename T6 = detail::NullType,
-          typename T7 = detail::NullType, typename T8 = detail::NullType,
-          typename T9 = detail::NullType, typename T10 = detail::NullType,
-          typename T11 = detail::NullType, typename T12 = detail::NullType,
-          typename T13 = detail::NullType, typename T14 = detail::NullType,
-          typename T15 = detail::NullType, typename T16 = detail::NullType,
-          typename T17 = detail::NullType, typename T18 = detail::NullType,
-          typename T19 = detail::NullType, typename T20 = detail::NullType,
-          typename T21 = detail::NullType, typename T22 = detail::NullType,
-          typename T23 = detail::NullType, typename T24 = detail::NullType,
-          typename T25 = detail::NullType, typename T26 = detail::NullType,
-          typename T27 = detail::NullType, typename T28 = detail::NullType,
-          typename T29 = detail::NullType, typename T30 = detail::NullType,
-          typename T31 = detail::NullType, typename T32 = detail::NullType,
-          typename T33 = detail::NullType, typename T34 = detail::NullType,
-          typename T35 = detail::NullType, typename T36 = detail::NullType,
-          typename T37 = detail::NullType, typename T38 = detail::NullType,
-          typename T39 = detail::NullType, typename T40 = detail::NullType,
-          typename T41 = detail::NullType, typename T42 = detail::NullType,
-          typename T43 = detail::NullType, typename T44 = detail::NullType,
-          typename T45 = detail::NullType, typename T46 = detail::NullType,
-          typename T47 = detail::NullType, typename T48 = detail::NullType,
-          typename T49 = detail::NullType, typename T50 = detail::NullType,
-          typename T51 = detail::NullType, typename T52 = detail::NullType,
-          typename T53 = detail::NullType, typename T54 = detail::NullType,
-          typename T55 = detail::NullType, typename T56 = detail::NullType,
-          typename T57 = detail::NullType, typename T58 = detail::NullType,
-          typename T59 = detail::NullType, typename T60 = detail::NullType>
-struct Types
-{
-private:
-    typedef typename Types<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17,
-                           T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30, T31,
-                           T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43, T44, T45,
-                           T46, T47, T48, T49, T50, T51, T52, T53, T54, T55, T56, T57, T58, T59,
-                           T60>::Result TailResult;
-
-public:
-    typedef detail::Typelist<T1, TailResult> Result;
-};
-
-template <>
-struct Types<>
-{ typedef detail::NullType Result; };
-
-template <typename T>
-struct StringMaker : detail::StringMakerBase<detail::has_insertion_operator<T>::value>
-{};
-
-template <typename T>
-struct StringMaker<T*>
-{
-    template <typename U>
-    static String convert(U* p) {
-        if(p)
-            return detail::rawMemoryToString(p);
-        return "NULL";
-    }
-};
-
-template <typename R, typename C>
-struct StringMaker<R C::*>
-{
-    static String convert(R C::*p) {
-        if(p)
-            return detail::rawMemoryToString(p);
-        return "NULL";
-    }
-};
-
-template <typename T>
-String toString(const DOCTEST_REF_WRAP(T) value) {
-    return StringMaker<T>::convert(value);
-}
-
-#ifdef DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING
-DOCTEST_INTERFACE String toString(char* in);
-DOCTEST_INTERFACE String toString(const char* in);
-#endif // DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING
-DOCTEST_INTERFACE String toString(bool in);
-DOCTEST_INTERFACE String toString(float in);
-DOCTEST_INTERFACE String toString(double in);
-DOCTEST_INTERFACE String toString(double long in);
-
-DOCTEST_INTERFACE String toString(char in);
-DOCTEST_INTERFACE String toString(char signed in);
-DOCTEST_INTERFACE String toString(char unsigned in);
-DOCTEST_INTERFACE String toString(int short in);
-DOCTEST_INTERFACE String toString(int short unsigned in);
-DOCTEST_INTERFACE String toString(int in);
-DOCTEST_INTERFACE String toString(int unsigned in);
-DOCTEST_INTERFACE String toString(int long in);
-DOCTEST_INTERFACE String toString(int long unsigned in);
-
-#ifdef DOCTEST_CONFIG_WITH_LONG_LONG
-DOCTEST_INTERFACE String toString(int long long in);
-DOCTEST_INTERFACE String toString(int long long unsigned in);
-#endif // DOCTEST_CONFIG_WITH_LONG_LONG
-
-#ifdef DOCTEST_CONFIG_WITH_NULLPTR
-DOCTEST_INTERFACE String toString(std::nullptr_t in);
-#endif // DOCTEST_CONFIG_WITH_NULLPTR
-
-class DOCTEST_INTERFACE Approx
-{
-public:
-    explicit Approx(double value);
-
-    Approx operator()(double value) const {
-        Approx approx(value);
-        approx.epsilon(m_epsilon);
-        approx.scale(m_scale);
-        return approx;
-    }
-
-#ifdef DOCTEST_CONFIG_INCLUDE_TYPE_TRAITS
-    template <typename T>
-    explicit Approx(const T& value,
-                    typename detail::enable_if<std::is_constructible<double, T>::value>::type* =
-                            static_cast<T*>(detail::getNull())) {
-        *this = Approx(static_cast<double>(value));
-    }
-#endif // DOCTEST_CONFIG_INCLUDE_TYPE_TRAITS
-
-    // clang-format off
-    // overloads for double - the first one is necessary as it is in the implementation part of doctest
-    // as for the others - keeping them for potentially faster compile times
-    DOCTEST_INTERFACE friend bool operator==(double lhs, Approx const& rhs);
-    friend bool operator==(Approx const& lhs, double rhs) { return operator==(rhs, lhs); }
-    friend bool operator!=(double lhs, Approx const& rhs) { return !operator==(lhs, rhs); }
-    friend bool operator!=(Approx const& lhs, double rhs) { return !operator==(rhs, lhs); }
-    friend bool operator<=(double lhs, Approx const& rhs) { return lhs < rhs.m_value || lhs == rhs; }
-    friend bool operator<=(Approx const& lhs, double rhs) { return lhs.m_value < rhs || lhs == rhs; }
-    friend bool operator>=(double lhs, Approx const& rhs) { return lhs > rhs.m_value || lhs == rhs; }
-    friend bool operator>=(Approx const& lhs, double rhs) { return lhs.m_value > rhs || lhs == rhs; }
-    friend bool operator< (double lhs, Approx const& rhs) { return lhs < rhs.m_value && lhs != rhs; }
-    friend bool operator< (Approx const& lhs, double rhs) { return lhs.m_value < rhs && lhs != rhs; }
-    friend bool operator> (double lhs, Approx const& rhs) { return lhs > rhs.m_value && lhs != rhs; }
-    friend bool operator> (Approx const& lhs, double rhs) { return lhs.m_value > rhs && lhs != rhs; }
-
-#ifdef DOCTEST_CONFIG_INCLUDE_TYPE_TRAITS
-#define DOCTEST_APPROX_PREFIX \
-    template <typename T> friend typename detail::enable_if<std::is_constructible<double, T>::value, bool>::type
-
-    DOCTEST_APPROX_PREFIX operator==(const T& lhs, const Approx& rhs) { return operator==(double(lhs), rhs); }
-    DOCTEST_APPROX_PREFIX operator==(const Approx& lhs, const T& rhs) { return operator==(rhs, lhs); }
-    DOCTEST_APPROX_PREFIX operator!=(const T& lhs, const Approx& rhs) { return !operator==(lhs, rhs); }
-    DOCTEST_APPROX_PREFIX operator!=(const Approx& lhs, const T& rhs) { return !operator==(rhs, lhs); }
-    DOCTEST_APPROX_PREFIX operator<=(const T& lhs, const Approx& rhs) { return double(lhs) < rhs.m_value || lhs == rhs; }
-    DOCTEST_APPROX_PREFIX operator<=(const Approx& lhs, const T& rhs) { return lhs.m_value < double(rhs) || lhs == rhs; }
-    DOCTEST_APPROX_PREFIX operator>=(const T& lhs, const Approx& rhs) { return double(lhs) > rhs.m_value || lhs == rhs; }
-    DOCTEST_APPROX_PREFIX operator>=(const Approx& lhs, const T& rhs) { return lhs.m_value > double(rhs) || lhs == rhs; }
-    DOCTEST_APPROX_PREFIX operator< (const T& lhs, const Approx& rhs) { return double(lhs) < rhs.m_value && lhs != rhs; }
-    DOCTEST_APPROX_PREFIX operator< (const Approx& lhs, const T& rhs) { return lhs.m_value < double(rhs) && lhs != rhs; }
-    DOCTEST_APPROX_PREFIX operator> (const T& lhs, const Approx& rhs) { return double(lhs) > rhs.m_value && lhs != rhs; }
-    DOCTEST_APPROX_PREFIX operator> (const Approx& lhs, const T& rhs) { return lhs.m_value > double(rhs) && lhs != rhs; }
-#undef DOCTEST_APPROX_PREFIX
-#endif // DOCTEST_CONFIG_INCLUDE_TYPE_TRAITS
-
-    // clang-format on
-
-    Approx& epsilon(double newEpsilon) {
-        m_epsilon = newEpsilon;
-        return *this;
-    }
-
-#ifdef DOCTEST_CONFIG_INCLUDE_TYPE_TRAITS
-    template <typename T>
-    typename detail::enable_if<std::is_constructible<double, T>::value, Approx&>::type epsilon(
-            const T& newEpsilon) {
-        m_epsilon = static_cast<double>(newEpsilon);
-        return *this;
-    }
-#endif //  DOCTEST_CONFIG_INCLUDE_TYPE_TRAITS
-
-    Approx& scale(double newScale) {
-        m_scale = newScale;
-        return *this;
-    }
-
-#ifdef DOCTEST_CONFIG_INCLUDE_TYPE_TRAITS
-    template <typename T>
-    typename detail::enable_if<std::is_constructible<double, T>::value, Approx&>::type scale(
-            const T& newScale) {
-        m_scale = static_cast<double>(newScale);
-        return *this;
-    }
-#endif // DOCTEST_CONFIG_INCLUDE_TYPE_TRAITS
-
-    String toString() const;
-
-private:
-    double m_epsilon;
-    double m_scale;
-    double m_value;
-};
-
-template <>
-inline String toString<Approx>(const DOCTEST_REF_WRAP(Approx) value) {
-    return value.toString();
-}
-
-#if !defined(DOCTEST_CONFIG_DISABLE)
-
-namespace detail
-{
-    // the function type this library works with
-    typedef void (*funcType)();
-
-    namespace assertType
-    {
-        enum Enum
-        {
-            // macro traits
-
-            is_warn    = 1,
-            is_check   = 2,
-            is_require = 4,
-
-            is_throws    = 8,
-            is_throws_as = 16,
-            is_nothrow   = 32,
-
-            is_fast  = 64, // not checked anywhere - used just to distinguish the types
-            is_false = 128,
-            is_unary = 256,
-
-            is_eq = 512,
-            is_ne = 1024,
-
-            is_lt = 2048,
-            is_gt = 4096,
-
-            is_ge = 8192,
-            is_le = 16384,
-
-            // macro types
-
-            DT_WARN    = is_warn,
-            DT_CHECK   = is_check,
-            DT_REQUIRE = is_require,
-
-            DT_WARN_FALSE    = is_false | is_warn,
-            DT_CHECK_FALSE   = is_false | is_check,
-            DT_REQUIRE_FALSE = is_false | is_require,
-
-            DT_WARN_THROWS    = is_throws | is_warn,
-            DT_CHECK_THROWS   = is_throws | is_check,
-            DT_REQUIRE_THROWS = is_throws | is_require,
-
-            DT_WARN_THROWS_AS    = is_throws_as | is_warn,
-            DT_CHECK_THROWS_AS   = is_throws_as | is_check,
-            DT_REQUIRE_THROWS_AS = is_throws_as | is_require,
-
-            DT_WARN_NOTHROW    = is_nothrow | is_warn,
-            DT_CHECK_NOTHROW   = is_nothrow | is_check,
-            DT_REQUIRE_NOTHROW = is_nothrow | is_require,
-
-            DT_WARN_EQ    = is_eq | is_warn,
-            DT_CHECK_EQ   = is_eq | is_check,
-            DT_REQUIRE_EQ = is_eq | is_require,
-
-            DT_WARN_NE    = is_ne | is_warn,
-            DT_CHECK_NE   = is_ne | is_check,
-            DT_REQUIRE_NE = is_ne | is_require,
-
-            DT_WARN_GT    = is_gt | is_warn,
-            DT_CHECK_GT   = is_gt | is_check,
-            DT_REQUIRE_GT = is_gt | is_require,
-
-            DT_WARN_LT    = is_lt | is_warn,
-            DT_CHECK_LT   = is_lt | is_check,
-            DT_REQUIRE_LT = is_lt | is_require,
-
-            DT_WARN_GE    = is_ge | is_warn,
-            DT_CHECK_GE   = is_ge | is_check,
-            DT_REQUIRE_GE = is_ge | is_require,
-
-            DT_WARN_LE    = is_le | is_warn,
-            DT_CHECK_LE   = is_le | is_check,
-            DT_REQUIRE_LE = is_le | is_require,
-
-            DT_WARN_UNARY    = is_unary | is_warn,
-            DT_CHECK_UNARY   = is_unary | is_check,
-            DT_REQUIRE_UNARY = is_unary | is_require,
-
-            DT_WARN_UNARY_FALSE    = is_false | is_unary | is_warn,
-            DT_CHECK_UNARY_FALSE   = is_false | is_unary | is_check,
-            DT_REQUIRE_UNARY_FALSE = is_false | is_unary | is_require,
-
-            DT_FAST_WARN_EQ    = is_fast | is_eq | is_warn,
-            DT_FAST_CHECK_EQ   = is_fast | is_eq | is_check,
-            DT_FAST_REQUIRE_EQ = is_fast | is_eq | is_require,
-
-            DT_FAST_WARN_NE    = is_fast | is_ne | is_warn,
-            DT_FAST_CHECK_NE   = is_fast | is_ne | is_check,
-            DT_FAST_REQUIRE_NE = is_fast | is_ne | is_require,
-
-            DT_FAST_WARN_GT    = is_fast | is_gt | is_warn,
-            DT_FAST_CHECK_GT   = is_fast | is_gt | is_check,
-            DT_FAST_REQUIRE_GT = is_fast | is_gt | is_require,
-
-            DT_FAST_WARN_LT    = is_fast | is_lt | is_warn,
-            DT_FAST_CHECK_LT   = is_fast | is_lt | is_check,
-            DT_FAST_REQUIRE_LT = is_fast | is_lt | is_require,
-
-            DT_FAST_WARN_GE    = is_fast | is_ge | is_warn,
-            DT_FAST_CHECK_GE   = is_fast | is_ge | is_check,
-            DT_FAST_REQUIRE_GE = is_fast | is_ge | is_require,
-
-            DT_FAST_WARN_LE    = is_fast | is_le | is_warn,
-            DT_FAST_CHECK_LE   = is_fast | is_le | is_check,
-            DT_FAST_REQUIRE_LE = is_fast | is_le | is_require,
-
-            DT_FAST_WARN_UNARY    = is_fast | is_unary | is_warn,
-            DT_FAST_CHECK_UNARY   = is_fast | is_unary | is_check,
-            DT_FAST_REQUIRE_UNARY = is_fast | is_unary | is_require,
-
-            DT_FAST_WARN_UNARY_FALSE    = is_fast | is_false | is_unary | is_warn,
-            DT_FAST_CHECK_UNARY_FALSE   = is_fast | is_false | is_unary | is_check,
-            DT_FAST_REQUIRE_UNARY_FALSE = is_fast | is_false | is_unary | is_require
-        };
-    } // namespace assertType
-
-    DOCTEST_INTERFACE const char* getAssertString(assertType::Enum val);
-
-    // clang-format off
-    template<class T>               struct decay_array       { typedef T type; };
-    template<class T, unsigned N>   struct decay_array<T[N]> { typedef T* type; };
-    template<class T>               struct decay_array<T[]>  { typedef T* type; };
-
-    template<class T>   struct not_char_pointer              { enum { value = 1 }; };
-    template<>          struct not_char_pointer<char*>       { enum { value = 0 }; };
-    template<>          struct not_char_pointer<const char*> { enum { value = 0 }; };
-
-    template<class T> struct can_use_op : not_char_pointer<typename decay_array<T>::type> {};
-    // clang-format on
-
-    struct TestFailureException
-    {};
-
-    DOCTEST_INTERFACE bool checkIfShouldThrow(assertType::Enum assert_type);
-    DOCTEST_INTERFACE void fastAssertThrowIfFlagSet(int flags);
-    DOCTEST_INTERFACE void throwException();
-
-    struct TestAccessibleContextState
-    {
-        bool no_throw; // to skip exceptions-related assertion macros
-        bool success;  // include successful assertions in output
-    };
-
-    struct ContextState;
-
-    DOCTEST_INTERFACE TestAccessibleContextState* getTestsContextState();
-
-    struct DOCTEST_INTERFACE SubcaseSignature
-    {
-        const char* m_name;
-        const char* m_file;
-        int         m_line;
-
-        SubcaseSignature(const char* name, const char* file, int line)
-                : m_name(name)
-                , m_file(file)
-                , m_line(line) {}
-
-        bool operator<(const SubcaseSignature& other) const;
-    };
-
-    // cppcheck-suppress copyCtorAndEqOperator
-    struct DOCTEST_INTERFACE Subcase
-    {
-        SubcaseSignature m_signature;
-        bool             m_entered;
-
-        Subcase(const char* name, const char* file, int line);
-        Subcase(const Subcase& other);
-        ~Subcase();
-
-        operator bool() const { return m_entered; }
-    };
-
-    template <typename L, typename R>
-    String stringifyBinaryExpr(const DOCTEST_REF_WRAP(L) lhs, const char* op,
-                               const DOCTEST_REF_WRAP(R) rhs) {
-        return toString(lhs) + op + toString(rhs);
-    }
-
-    struct DOCTEST_INTERFACE Result
-    {
-        bool   m_passed;
-        String m_decomposition;
-
-        ~Result();
-
-        DOCTEST_NOINLINE Result(bool passed = false, const String& decomposition = String())
-                : m_passed(passed)
-                , m_decomposition(decomposition) {}
-
-        DOCTEST_NOINLINE Result(const Result& other)
-                : m_passed(other.m_passed)
-                , m_decomposition(other.m_decomposition) {}
-
-        Result& operator=(const Result& other);
-
-        operator bool() { return !m_passed; }
-
-        // clang-format off
-        // forbidding some expressions based on this table: http://en.cppreference.com/w/cpp/language/operator_precedence
-        template <typename R> Result& operator&  (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return *this; }
-        template <typename R> Result& operator^  (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return *this; }
-        template <typename R> Result& operator|  (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return *this; }
-        template <typename R> Result& operator&& (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return *this; }
-        template <typename R> Result& operator|| (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return *this; }
-        template <typename R> Result& operator== (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return *this; }
-        template <typename R> Result& operator!= (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return *this; }
-        template <typename R> Result& operator<  (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return *this; }
-        template <typename R> Result& operator>  (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return *this; }
-        template <typename R> Result& operator<= (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return *this; }
-        template <typename R> Result& operator>= (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return *this; }
-        template <typename R> Result& operator=  (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return *this; }
-        template <typename R> Result& operator+= (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return *this; }
-        template <typename R> Result& operator-= (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return *this; }
-        template <typename R> Result& operator*= (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return *this; }
-        template <typename R> Result& operator/= (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return *this; }
-        template <typename R> Result& operator%= (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return *this; }
-        template <typename R> Result& operator<<=(const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return *this; }
-        template <typename R> Result& operator>>=(const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return *this; }
-        template <typename R> Result& operator&= (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return *this; }
-        template <typename R> Result& operator^= (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return *this; }
-        template <typename R> Result& operator|= (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return *this; }
-        // clang-format on
-    };
-
-#ifndef DOCTEST_CONFIG_NO_COMPARISON_WARNING_SUPPRESSION
-
-#if defined(__clang__)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wsign-conversion"
-#pragma clang diagnostic ignored "-Wsign-compare"
-//#pragma clang diagnostic ignored "-Wdouble-promotion"
-//#pragma clang diagnostic ignored "-Wconversion"
-//#pragma clang diagnostic ignored "-Wfloat-equal"
-#endif // __clang__
-
-#if defined(__GNUC__) && !defined(__clang__)
-#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 6)
-#pragma GCC diagnostic push
-#endif // > gcc 4.6
-#pragma GCC diagnostic ignored "-Wsign-conversion"
-#pragma GCC diagnostic ignored "-Wsign-compare"
-#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 5)
-//#pragma GCC diagnostic ignored "-Wdouble-promotion"
-#endif // > gcc 4.5
-//#pragma GCC diagnostic ignored "-Wconversion"
-//#pragma GCC diagnostic ignored "-Wfloat-equal"
-#endif // __GNUC__
-
-#ifdef _MSC_VER
-#pragma warning(push)
-// http://stackoverflow.com/questions/39479163 what's the difference between C4018 and C4389
-#pragma warning(disable : 4389) // 'operator' : signed/unsigned mismatch
-#pragma warning(disable : 4018) // 'expression' : signed/unsigned mismatch
-//#pragma warning(disable : 4805) // 'operation' : unsafe mix of type 'type' and type 'type' in operation
-#endif // _MSC_VER
-
-#endif // DOCTEST_CONFIG_NO_COMPARISON_WARNING_SUPPRESSION
-
-// clang-format off
-#ifndef DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING
-#define DOCTEST_COMPARISON_RETURN_TYPE bool
-#else // DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING
-#define DOCTEST_COMPARISON_RETURN_TYPE typename enable_if<can_use_op<L>::value || can_use_op<R>::value, bool>::type
-    inline bool eq(const char* lhs, const char* rhs) { return String(lhs) == String(rhs); }
-    inline bool ne(const char* lhs, const char* rhs) { return String(lhs) != String(rhs); }
-    inline bool lt(const char* lhs, const char* rhs) { return String(lhs) <  String(rhs); }
-    inline bool gt(const char* lhs, const char* rhs) { return String(lhs) >  String(rhs); }
-    inline bool le(const char* lhs, const char* rhs) { return String(lhs) <= String(rhs); }
-    inline bool ge(const char* lhs, const char* rhs) { return String(lhs) >= String(rhs); }
-#endif // DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING
-
-    template <typename L, typename R> DOCTEST_COMPARISON_RETURN_TYPE eq(const DOCTEST_REF_WRAP(L) lhs, const DOCTEST_REF_WRAP(R) rhs) { return lhs == rhs; }
-    template <typename L, typename R> DOCTEST_COMPARISON_RETURN_TYPE ne(const DOCTEST_REF_WRAP(L) lhs, const DOCTEST_REF_WRAP(R) rhs) { return lhs != rhs; }
-    template <typename L, typename R> DOCTEST_COMPARISON_RETURN_TYPE lt(const DOCTEST_REF_WRAP(L) lhs, const DOCTEST_REF_WRAP(R) rhs) { return lhs <  rhs; }
-    template <typename L, typename R> DOCTEST_COMPARISON_RETURN_TYPE gt(const DOCTEST_REF_WRAP(L) lhs, const DOCTEST_REF_WRAP(R) rhs) { return lhs >  rhs; }
-    template <typename L, typename R> DOCTEST_COMPARISON_RETURN_TYPE le(const DOCTEST_REF_WRAP(L) lhs, const DOCTEST_REF_WRAP(R) rhs) { return lhs <= rhs; }
-    template <typename L, typename R> DOCTEST_COMPARISON_RETURN_TYPE ge(const DOCTEST_REF_WRAP(L) lhs, const DOCTEST_REF_WRAP(R) rhs) { return lhs >= rhs; }
-// clang-format on
-
-#ifndef DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING
-#define DOCTEST_CMP_EQ(l, r) l == r
-#define DOCTEST_CMP_NE(l, r) l != r
-#define DOCTEST_CMP_GT(l, r) l > r
-#define DOCTEST_CMP_LT(l, r) l < r
-#define DOCTEST_CMP_GE(l, r) l >= r
-#define DOCTEST_CMP_LE(l, r) l <= r
-#else // DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING
-#define DOCTEST_CMP_EQ(l, r) eq(l, r)
-#define DOCTEST_CMP_NE(l, r) ne(l, r)
-#define DOCTEST_CMP_GT(l, r) gt(l, r)
-#define DOCTEST_CMP_LT(l, r) lt(l, r)
-#define DOCTEST_CMP_GE(l, r) ge(l, r)
-#define DOCTEST_CMP_LE(l, r) le(l, r)
-#endif // DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING
-
-#define DOCTEST_DO_BINARY_EXPRESSION_COMPARISON(op, op_str, op_macro)                              \
-    template <typename R>                                                                          \
-    DOCTEST_NOINLINE Result operator op(const DOCTEST_REF_WRAP(R) rhs) {                           \
-        bool res = op_macro(lhs, rhs);                                                             \
-        if(m_assert_type & assertType::is_false)                                                   \
-            res = !res;                                                                            \
-        if(!res || doctest::detail::getTestsContextState()->success)                               \
-            return Result(res, stringifyBinaryExpr(lhs, op_str, rhs));                             \
-        return Result(res);                                                                        \
-    }
-
-#define DOCTEST_FORBIT_EXPRESSION(op)                                                              \
-    template <typename R>                                                                          \
-    Expression_lhs& operator op(const R&) {                                                        \
-        DOCTEST_STATIC_ASSERT(deferred_false<R>::value,                                            \
-                              Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison);         \
-        return *this;                                                                              \
-    }
-
-    template <typename L>
-    // cppcheck-suppress copyCtorAndEqOperator
-    struct Expression_lhs
-    {
-        L                lhs;
-        assertType::Enum m_assert_type;
-
-        explicit Expression_lhs(L in, assertType::Enum assert_type)
-                : lhs(in)
-                , m_assert_type(assert_type) {}
-
-        Expression_lhs(const Expression_lhs& other)
-                : lhs(other.lhs) {}
-
-        DOCTEST_NOINLINE operator Result() {
-            bool res = !!lhs;
-            if(m_assert_type & assertType::is_false) //!OCLINT bitwise operator in conditional
-                res = !res;
-
-            if(!res || getTestsContextState()->success)
-                return Result(res, toString(lhs));
-            return Result(res);
-        }
-
-        // clang-format off
-        DOCTEST_DO_BINARY_EXPRESSION_COMPARISON(==, " == ", DOCTEST_CMP_EQ) //!OCLINT bitwise operator in conditional
-        DOCTEST_DO_BINARY_EXPRESSION_COMPARISON(!=, " != ", DOCTEST_CMP_NE) //!OCLINT bitwise operator in conditional
-        DOCTEST_DO_BINARY_EXPRESSION_COMPARISON(>, " >  ", DOCTEST_CMP_GT) //!OCLINT bitwise operator in conditional
-        DOCTEST_DO_BINARY_EXPRESSION_COMPARISON(<, " <  ", DOCTEST_CMP_LT) //!OCLINT bitwise operator in conditional
-        DOCTEST_DO_BINARY_EXPRESSION_COMPARISON(>=, " >= ", DOCTEST_CMP_GE) //!OCLINT bitwise operator in conditional
-        DOCTEST_DO_BINARY_EXPRESSION_COMPARISON(<=, " <= ", DOCTEST_CMP_LE) //!OCLINT bitwise operator in conditional
-        // clang-format on
-
-        // forbidding some expressions based on this table: http://en.cppreference.com/w/cpp/language/operator_precedence
-        DOCTEST_FORBIT_EXPRESSION(&)
-        DOCTEST_FORBIT_EXPRESSION (^)
-        DOCTEST_FORBIT_EXPRESSION(|)
-        DOCTEST_FORBIT_EXPRESSION(&&)
-        DOCTEST_FORBIT_EXPRESSION(||)
-        DOCTEST_FORBIT_EXPRESSION(=)
-        DOCTEST_FORBIT_EXPRESSION(+=)
-        DOCTEST_FORBIT_EXPRESSION(-=)
-        DOCTEST_FORBIT_EXPRESSION(*=)
-        DOCTEST_FORBIT_EXPRESSION(/=)
-        DOCTEST_FORBIT_EXPRESSION(%=)
-        DOCTEST_FORBIT_EXPRESSION(<<=)
-        DOCTEST_FORBIT_EXPRESSION(>>=)
-        DOCTEST_FORBIT_EXPRESSION(&=)
-        DOCTEST_FORBIT_EXPRESSION(^=)
-        DOCTEST_FORBIT_EXPRESSION(|=)
-        // these 2 are unfortunate because they should be allowed - they have higher precedence over the comparisons, but the
-        // ExpressionDecomposer class uses the left shift operator to capture the left operand of the binary expression...
-        DOCTEST_FORBIT_EXPRESSION(<<)
-        DOCTEST_FORBIT_EXPRESSION(>>)
-    };
-
-#ifndef DOCTEST_CONFIG_NO_COMPARISON_WARNING_SUPPRESSION
-
-#if defined(__clang__)
-#pragma clang diagnostic pop
-#endif // __clang__
-
-#if defined(__GNUC__) && !defined(__clang__)
-#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 6)
-#pragma GCC diagnostic pop
-#endif // > gcc 4.6
-#endif // __GNUC__
-
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif // _MSC_VER
-
-#endif // DOCTEST_CONFIG_NO_COMPARISON_WARNING_SUPPRESSION
-
-    struct ExpressionDecomposer
-    {
-        assertType::Enum m_assert_type;
-
-        ExpressionDecomposer(assertType::Enum assert_type)
-                : m_assert_type(assert_type) {}
-
-        // The right operator for capturing expressions is "<=" instead of "<<" (based on the operator precedence table)
-        // but then there will be warnings from GCC about "-Wparentheses" and since "_Pragma()" is problematic this will stay for now...
-        // https://github.com/philsquared/Catch/issues/870
-        // https://github.com/philsquared/Catch/issues/565
-        template <typename L>
-        Expression_lhs<const DOCTEST_REF_WRAP(L)> operator<<(const DOCTEST_REF_WRAP(L) operand) {
-            return Expression_lhs<const DOCTEST_REF_WRAP(L)>(operand, m_assert_type);
-        }
-    };
-
-    struct DOCTEST_INTERFACE TestCase
-    {
-        // not used for determining uniqueness
-        funcType m_test;    // a function pointer to the test case
-        String m_full_name; // contains the name (only for templated test cases!) + the template type
-        const char* m_name;       // name of the test case
-        const char* m_type;       // for templated test cases - gets appended to the real name
-        const char* m_test_suite; // the test suite in which the test was added
-        const char* m_description;
-        bool        m_skip;
-        bool        m_may_fail;
-        bool        m_should_fail;
-        int         m_expected_failures;
-        double      m_timeout;
-
-        // fields by which uniqueness of test cases shall be determined
-        const char* m_file; // the file in which the test was registered
-        unsigned    m_line; // the line where the test was registered
-        int m_template_id; // an ID used to distinguish between the different versions of a templated test case
-
-        TestCase(funcType test, const char* file, unsigned line, const TestSuite& test_suite,
-                 const char* type = "", int template_id = -1);
-
-        // for gcc 4.7
-        DOCTEST_NOINLINE ~TestCase() {}
-
-        TestCase& operator*(const char* in);
-
-        template <typename T>
-        TestCase& operator*(const T& in) {
-            in.fill(*this);
-            return *this;
-        }
-
-        TestCase(const TestCase& other) { *this = other; }
-
-        TestCase& operator=(const TestCase& other);
-
-        bool operator<(const TestCase& other) const;
-    };
-
-    // forward declarations of functions used by the macros
-    DOCTEST_INTERFACE int regTest(const TestCase& tc);
-    DOCTEST_INTERFACE int setTestSuite(const TestSuite& ts);
-
-    DOCTEST_INTERFACE void addFailedAssert(assertType::Enum assert_type);
-
-    DOCTEST_INTERFACE void logTestStart(const TestCase& tc);
-    DOCTEST_INTERFACE void logTestEnd();
-
-    DOCTEST_INTERFACE void logTestException(const String& what, bool crash = false);
-
-    DOCTEST_INTERFACE void logAssert(bool passed, const char* decomposition, bool threw,
-                                     const String& exception, const char* expr,
-                                     assertType::Enum assert_type, const char* file, int line);
-
-    DOCTEST_INTERFACE void logAssertThrows(bool threw, const char* expr,
-                                           assertType::Enum assert_type, const char* file,
-                                           int line);
-
-    DOCTEST_INTERFACE void logAssertThrowsAs(bool threw, bool threw_as, const char* as,
-                                             const String& exception, const char* expr,
-                                             assertType::Enum assert_type, const char* file,
-                                             int line);
-
-    DOCTEST_INTERFACE void logAssertNothrow(bool threw, const String& exception, const char* expr,
-                                            assertType::Enum assert_type, const char* file,
-                                            int line);
-
-    DOCTEST_INTERFACE bool isDebuggerActive();
-    DOCTEST_INTERFACE void writeToDebugConsole(const String&);
-
-    namespace binaryAssertComparison
-    {
-        enum Enum
-        {
-            eq = 0,
-            ne,
-            gt,
-            lt,
-            ge,
-            le
-        };
-    } // namespace binaryAssertComparison
-
-    // clang-format off
-    template <int, class L, class R> struct RelationalComparator     { bool operator()(const DOCTEST_REF_WRAP(L),     const DOCTEST_REF_WRAP(R)    ) const { return false;        } };
-    template <class L, class R> struct RelationalComparator<0, L, R> { bool operator()(const DOCTEST_REF_WRAP(L) lhs, const DOCTEST_REF_WRAP(R) rhs) const { return eq(lhs, rhs); } };
-    template <class L, class R> struct RelationalComparator<1, L, R> { bool operator()(const DOCTEST_REF_WRAP(L) lhs, const DOCTEST_REF_WRAP(R) rhs) const { return ne(lhs, rhs); } };
-    template <class L, class R> struct RelationalComparator<2, L, R> { bool operator()(const DOCTEST_REF_WRAP(L) lhs, const DOCTEST_REF_WRAP(R) rhs) const { return gt(lhs, rhs); } };
-    template <class L, class R> struct RelationalComparator<3, L, R> { bool operator()(const DOCTEST_REF_WRAP(L) lhs, const DOCTEST_REF_WRAP(R) rhs) const { return lt(lhs, rhs); } };
-    template <class L, class R> struct RelationalComparator<4, L, R> { bool operator()(const DOCTEST_REF_WRAP(L) lhs, const DOCTEST_REF_WRAP(R) rhs) const { return ge(lhs, rhs); } };
-    template <class L, class R> struct RelationalComparator<5, L, R> { bool operator()(const DOCTEST_REF_WRAP(L) lhs, const DOCTEST_REF_WRAP(R) rhs) const { return le(lhs, rhs); } };
-    // clang-format on
-
-    struct DOCTEST_INTERFACE ResultBuilder
-    {
-        assertType::Enum m_assert_type;
-        const char*      m_file;
-        int              m_line;
-        const char*      m_expr;
-        const char*      m_exception_type;
-
-        Result m_result;
-        bool   m_threw;
-        bool   m_threw_as;
-        bool   m_failed;
-        String m_exception;
-
-        ResultBuilder(assertType::Enum assert_type, const char* file, int line, const char* expr,
-                      const char* exception_type = "");
-
-        ~ResultBuilder();
-
-        void setResult(const Result& res) { m_result = res; }
-
-        template <int         comparison, typename L, typename R>
-        DOCTEST_NOINLINE void binary_assert(const DOCTEST_REF_WRAP(L) lhs,
-                                            const DOCTEST_REF_WRAP(R) rhs) {
-            m_result.m_passed = RelationalComparator<comparison, L, R>()(lhs, rhs);
-            if(!m_result.m_passed || getTestsContextState()->success)
-                m_result.m_decomposition = stringifyBinaryExpr(lhs, ", ", rhs);
-        }
-
-        template <typename L>
-        DOCTEST_NOINLINE void unary_assert(const DOCTEST_REF_WRAP(L) val) {
-            m_result.m_passed = !!val;
-
-            if(m_assert_type & assertType::is_false) //!OCLINT bitwise operator in conditional
-                m_result.m_passed = !m_result.m_passed;
-
-            if(!m_result.m_passed || getTestsContextState()->success)
-                m_result.m_decomposition = toString(val);
-        }
-
-        void unexpectedExceptionOccurred();
-
-        bool log();
-        void react() const;
-    };
-
-    namespace assertAction
-    {
-        enum Enum
-        {
-            nothing     = 0,
-            dbgbreak    = 1,
-            shouldthrow = 2
-        };
-    } // namespace assertAction
-
-    template <int        comparison, typename L, typename R>
-    DOCTEST_NOINLINE int fast_binary_assert(assertType::Enum assert_type, const char* file,
-                                            int line, const char* expr,
-                                            const DOCTEST_REF_WRAP(L) lhs,
-                                            const DOCTEST_REF_WRAP(R) rhs) {
-        ResultBuilder rb(assert_type, file, line, expr);
-
-        rb.m_result.m_passed = RelationalComparator<comparison, L, R>()(lhs, rhs);
-
-        if(!rb.m_result.m_passed || getTestsContextState()->success)
-            rb.m_result.m_decomposition = stringifyBinaryExpr(lhs, ", ", rhs);
-
-        int res = 0;
-
-        if(rb.log())
-            res |= assertAction::dbgbreak;
-
-        if(rb.m_failed && checkIfShouldThrow(assert_type))
-            res |= assertAction::shouldthrow;
-
-#ifdef DOCTEST_CONFIG_SUPER_FAST_ASSERTS
-        // #########################################################################################
-        // IF THE DEBUGGER BREAKS HERE - GO 1 LEVEL UP IN THE CALLSTACK TO SEE THE FAILING ASSERTION
-        // THIS IS THE EFFECT OF HAVING 'DOCTEST_CONFIG_SUPER_FAST_ASSERTS' DEFINED
-        // #########################################################################################
-        if(res & assertAction::dbgbreak)
-            DOCTEST_BREAK_INTO_DEBUGGER();
-        fastAssertThrowIfFlagSet(res);
-#endif // DOCTEST_CONFIG_SUPER_FAST_ASSERTS
-
-        return res;
-    }
-
-    template <typename L>
-    DOCTEST_NOINLINE int fast_unary_assert(assertType::Enum assert_type, const char* file, int line,
-                                           const char* val_str, const DOCTEST_REF_WRAP(L) val) {
-        ResultBuilder rb(assert_type, file, line, val_str);
-
-        rb.m_result.m_passed = !!val;
-
-        if(assert_type & assertType::is_false) //!OCLINT bitwise operator in conditional
-            rb.m_result.m_passed = !rb.m_result.m_passed;
-
-        if(!rb.m_result.m_passed || getTestsContextState()->success)
-            rb.m_result.m_decomposition = toString(val);
-
-        int res = 0;
-
-        if(rb.log())
-            res |= assertAction::dbgbreak;
-
-        if(rb.m_failed && checkIfShouldThrow(assert_type))
-            res |= assertAction::shouldthrow;
-
-#ifdef DOCTEST_CONFIG_SUPER_FAST_ASSERTS
-        // #########################################################################################
-        // IF THE DEBUGGER BREAKS HERE - GO 1 LEVEL UP IN THE CALLSTACK TO SEE THE FAILING ASSERTION
-        // THIS IS THE EFFECT OF HAVING 'DOCTEST_CONFIG_SUPER_FAST_ASSERTS' DEFINED
-        // #########################################################################################
-        if(res & assertAction::dbgbreak)
-            DOCTEST_BREAK_INTO_DEBUGGER();
-        fastAssertThrowIfFlagSet(res);
-#endif // DOCTEST_CONFIG_SUPER_FAST_ASSERTS
-
-        return res;
-    }
-
-    struct DOCTEST_INTERFACE IExceptionTranslator
-    {
-        virtual ~IExceptionTranslator() {}
-        virtual bool translate(String&) const = 0;
-    };
-
-    template <typename T>
-    class ExceptionTranslator : public IExceptionTranslator //!OCLINT destructor of virtual class
-    {
-    public:
-        explicit ExceptionTranslator(String (*translateFunction)(T))
-                : m_translateFunction(translateFunction) {}
-
-        bool translate(String& res) const {
-#ifndef DOCTEST_CONFIG_NO_EXCEPTIONS
-            try {
-                throw;
-                // cppcheck-suppress catchExceptionByValue
-            } catch(T ex) {                    // NOLINT
-                res = m_translateFunction(ex); //!OCLINT parameter reassignment
-                return true;
-            } catch(...) {} //!OCLINT -  empty catch statement
-#endif                      // DOCTEST_CONFIG_NO_EXCEPTIONS
-            ((void)res);    // to silence -Wunused-parameter
-            return false;
-        }
-
-    protected:
-        String (*m_translateFunction)(T);
-    };
-
-    DOCTEST_INTERFACE void registerExceptionTranslatorImpl(
-            const IExceptionTranslator* translateFunction);
-
-    // FIX FOR VISUAL STUDIO VERSIONS PRIOR TO 2015 - they failed to compile the call to operator<< with
-    // std::ostream passed as a reference noting that there is a use of an undefined type (which there isn't)
-    DOCTEST_INTERFACE void writeStringToStream(std::ostream* stream, const String& str);
-
-    template <bool C>
-    struct StringStreamBase
-    {
-        template <typename T>
-        static void convert(std::ostream* stream, const T& in) {
-            writeStringToStream(stream, toString(in));
-        }
-
-        // always treat char* as a string in this context - no matter
-        // if DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING is defined
-        static void convert(std::ostream* stream, const char* in) {
-            writeStringToStream(stream, String(in));
-        }
-    };
-
-    template <>
-    struct StringStreamBase<true>
-    {
-        template <typename T>
-        static void convert(std::ostream* stream, const T& in) {
-            *stream << in;
-        }
-    };
-
-    template <typename T>
-    struct StringStream : StringStreamBase<has_insertion_operator<T>::value>
-    {};
-
-    template <typename T>
-    void toStream(std::ostream* stream, const T& value) {
-        StringStream<T>::convert(stream, value);
-    }
-
-#ifdef DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING
-    DOCTEST_INTERFACE void toStream(std::ostream* stream, char* in);
-    DOCTEST_INTERFACE void toStream(std::ostream* stream, const char* in);
-#endif // DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING
-    DOCTEST_INTERFACE void toStream(std::ostream* stream, bool in);
-    DOCTEST_INTERFACE void toStream(std::ostream* stream, float in);
-    DOCTEST_INTERFACE void toStream(std::ostream* stream, double in);
-    DOCTEST_INTERFACE void toStream(std::ostream* stream, double long in);
-
-    DOCTEST_INTERFACE void toStream(std::ostream* stream, char in);
-    DOCTEST_INTERFACE void toStream(std::ostream* stream, char signed in);
-    DOCTEST_INTERFACE void toStream(std::ostream* stream, char unsigned in);
-    DOCTEST_INTERFACE void toStream(std::ostream* stream, int short in);
-    DOCTEST_INTERFACE void toStream(std::ostream* stream, int short unsigned in);
-    DOCTEST_INTERFACE void toStream(std::ostream* stream, int in);
-    DOCTEST_INTERFACE void toStream(std::ostream* stream, int unsigned in);
-    DOCTEST_INTERFACE void toStream(std::ostream* stream, int long in);
-    DOCTEST_INTERFACE void toStream(std::ostream* stream, int long unsigned in);
-
-#ifdef DOCTEST_CONFIG_WITH_LONG_LONG
-    DOCTEST_INTERFACE void toStream(std::ostream* stream, int long long in);
-    DOCTEST_INTERFACE void toStream(std::ostream* stream, int long long unsigned in);
-#endif // DOCTEST_CONFIG_WITH_LONG_LONG
-
-    struct IContextScope
-    {
-        virtual ~IContextScope() {}
-        virtual void build(std::ostream*) = 0;
-    };
-
-    DOCTEST_INTERFACE void addToContexts(IContextScope* ptr);
-    DOCTEST_INTERFACE void popFromContexts();
-    DOCTEST_INTERFACE void useContextIfExceptionOccurred(IContextScope* ptr);
-
-    // cppcheck-suppress copyCtorAndEqOperator
-    class ContextBuilder
-    {
-        friend class ContextScope;
-
-        struct ICapture
-        {
-            virtual ~ICapture() {}
-            virtual void toStream(std::ostream*) const = 0;
-        };
-
-        template <typename T>
-        struct Capture : ICapture //!OCLINT destructor of virtual class
-        {
-            const T* capture;
-
-            explicit Capture(const T* in)
-                    : capture(in) {}
-            virtual void toStream(std::ostream* stream) const { // override
-                detail::toStream(stream, *capture);
-            }
-        };
-
-        struct Chunk
-        {
-            char buf[sizeof(Capture<char>)]; // place to construct a Capture<T>
-        };
-
-        struct Node
-        {
-            Chunk chunk;
-            Node* next;
-        };
-
-        Chunk stackChunks[DOCTEST_CONFIG_NUM_CAPTURES_ON_STACK];
-        int   numCaptures;
-        Node* head;
-        Node* tail;
-
-        void build(std::ostream* stream) const {
-            int curr = 0;
-            // iterate over small buffer
-            while(curr < numCaptures && curr < DOCTEST_CONFIG_NUM_CAPTURES_ON_STACK)
-                reinterpret_cast<const ICapture*>(stackChunks[curr++].buf)->toStream(stream);
-            // iterate over list
-            Node* curr_elem = head;
-            while(curr < numCaptures) {
-                reinterpret_cast<const ICapture*>(curr_elem->chunk.buf)->toStream(stream);
-                curr_elem = curr_elem->next;
-                ++curr;
-            }
-        }
-
-        // steal the contents of the other - acting as a move constructor...
-        DOCTEST_NOINLINE ContextBuilder(ContextBuilder& other)
-                : numCaptures(other.numCaptures)
-                , head(other.head)
-                , tail(other.tail) {
-            other.numCaptures = 0;
-            other.head        = 0;
-            other.tail        = 0;
-            my_memcpy(stackChunks, other.stackChunks,
-                      unsigned(int(sizeof(Chunk)) * DOCTEST_CONFIG_NUM_CAPTURES_ON_STACK));
-        }
-
-        ContextBuilder& operator=(const ContextBuilder&); // NOLINT
-
-    public:
-        // cppcheck-suppress uninitMemberVar
-        DOCTEST_NOINLINE ContextBuilder() // NOLINT
-                : numCaptures(0)
-                , head(0)
-                , tail(0) {}
-
-        template <typename T>
-        DOCTEST_NOINLINE ContextBuilder& operator<<(T& in) {
-            Capture<T> temp(&in);
-
-            // construct either on stack or on heap
-            // copy the bytes for the whole object - including the vtable because we cant construct
-            // the object directly in the buffer using placement new - need the <new> header...
-            if(numCaptures < DOCTEST_CONFIG_NUM_CAPTURES_ON_STACK) {
-                my_memcpy(stackChunks[numCaptures].buf, &temp, sizeof(Chunk));
-            } else {
-                Node* curr = new Node;
-                curr->next = 0;
-                if(tail) {
-                    tail->next = curr;
-                    tail       = curr;
-                } else {
-                    head = tail = curr;
-                }
-
-                my_memcpy(tail->chunk.buf, &temp, sizeof(Chunk));
-            }
-            ++numCaptures;
-            return *this;
-        }
-
-        DOCTEST_NOINLINE ~ContextBuilder() {
-            // free the linked list - the ones on the stack are left as-is
-            // no destructors are called at all - there is no need
-            while(head) {
-                Node* next = head->next;
-                delete head;
-                head = next;
-            }
-        }
-
-#ifdef DOCTEST_CONFIG_WITH_RVALUE_REFERENCES
-        template <typename T>
-        ContextBuilder& operator<<(const T&&) {
-            DOCTEST_STATIC_ASSERT(
-                    deferred_false<T>::value,
-                    Cannot_pass_temporaries_or_rvalues_to_the_streaming_operator_because_it_caches_pointers_to_the_passed_objects_for_lazy_evaluation);
-            return *this;
-        }
-#endif // DOCTEST_CONFIG_WITH_RVALUE_REFERENCES
-    };
-
-    class ContextScope : public IContextScope
-    {
-        ContextBuilder contextBuilder;
-        bool           built;
-
-    public:
-        DOCTEST_NOINLINE explicit ContextScope(ContextBuilder& temp)
-                : contextBuilder(temp)
-                , built(false) {
-            addToContexts(this);
-        }
-
-        DOCTEST_NOINLINE ~ContextScope() {
-            if(!built)
-                useContextIfExceptionOccurred(this);
-            popFromContexts();
-        }
-
-        void build(std::ostream* stream) {
-            built = true;
-            contextBuilder.build(stream);
-        }
-    };
-
-    class DOCTEST_INTERFACE MessageBuilder
-    {
-        std::ostream*    m_stream;
-        const char*      m_file;
-        int              m_line;
-        assertType::Enum m_severity;
-
-    public:
-        MessageBuilder(const char* file, int line, assertType::Enum severity);
-        ~MessageBuilder();
-
-        template <typename T>
-        MessageBuilder& operator<<(const T& in) {
-            toStream(m_stream, in);
-            return *this;
-        }
-
-        bool log();
-        void react();
-    };
-} // namespace detail
-
-struct test_suite
-{
-    const char* data;
-    test_suite(const char* in)
-            : data(in) {}
-    void fill(detail::TestCase& state) const { state.m_test_suite = data; }
-    void fill(detail::TestSuite& state) const { state.m_test_suite = data; }
-};
-
-struct description
-{
-    const char* data;
-    description(const char* in)
-            : data(in) {}
-    void fill(detail::TestCase& state) const { state.m_description = data; }
-    void fill(detail::TestSuite& state) const { state.m_description = data; }
-};
-
-struct skip
-{
-    bool data;
-    skip(bool in = true)
-            : data(in) {}
-    void fill(detail::TestCase& state) const { state.m_skip = data; }
-    void fill(detail::TestSuite& state) const { state.m_skip = data; }
-};
-
-struct timeout
-{
-    double data;
-    timeout(double in)
-            : data(in) {}
-    void fill(detail::TestCase& state) const { state.m_timeout = data; }
-    void fill(detail::TestSuite& state) const { state.m_timeout = data; }
-};
-
-struct may_fail
-{
-    bool data;
-    may_fail(bool in = true)
-            : data(in) {}
-    void fill(detail::TestCase& state) const { state.m_may_fail = data; }
-    void fill(detail::TestSuite& state) const { state.m_may_fail = data; }
-};
-
-struct should_fail
-{
-    bool data;
-    should_fail(bool in = true)
-            : data(in) {}
-    void fill(detail::TestCase& state) const { state.m_should_fail = data; }
-    void fill(detail::TestSuite& state) const { state.m_should_fail = data; }
-};
-
-struct expected_failures
-{
-    int data;
-    expected_failures(int in)
-            : data(in) {}
-    void fill(detail::TestCase& state) const { state.m_expected_failures = data; }
-    void fill(detail::TestSuite& state) const { state.m_expected_failures = data; }
-};
-
-#endif // DOCTEST_CONFIG_DISABLE
-
-#ifndef DOCTEST_CONFIG_DISABLE
-template <typename T>
-int registerExceptionTranslator(String (*translateFunction)(T)) {
-#if defined(__clang__)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wexit-time-destructors"
-#endif // __clang__
-    static detail::ExceptionTranslator<T> exceptionTranslator(translateFunction);
-#if defined(__clang__)
-#pragma clang diagnostic pop
-#endif // __clang__
-    detail::registerExceptionTranslatorImpl(&exceptionTranslator);
-    return 0;
-}
-
-#else  // DOCTEST_CONFIG_DISABLE
-template <typename T>
-int registerExceptionTranslator(String (*)(T)) {
-    return 0;
-}
-#endif // DOCTEST_CONFIG_DISABLE
-
-DOCTEST_INTERFACE bool isRunningInTest();
-
-// cppcheck-suppress noCopyConstructor
-class DOCTEST_INTERFACE Context
-{
-#if !defined(DOCTEST_CONFIG_DISABLE)
-    detail::ContextState* p;
-
-    void parseArgs(int argc, const char* const* argv, bool withDefaults = false);
-
-#endif // DOCTEST_CONFIG_DISABLE
-
-public:
-    explicit Context(int argc = 0, const char* const* argv = 0);
-
-    ~Context();
-
-    void applyCommandLine(int argc, const char* const* argv);
-
-    void addFilter(const char* filter, const char* value);
-    void clearFilters();
-    void setOption(const char* option, int value);
-    void setOption(const char* option, const char* value);
-
-    bool shouldExit();
-
-    int run();
-};
-
-} // namespace doctest
-
-// if registering is not disabled
-#if !defined(DOCTEST_CONFIG_DISABLE)
-
-#ifdef DOCTEST_CONFIG_WITH_VARIADIC_MACROS
-#define DOCTEST_EXPAND_VA_ARGS(...) __VA_ARGS__
-#else // DOCTEST_CONFIG_WITH_VARIADIC_MACROS
-#define DOCTEST_EXPAND_VA_ARGS
-#endif // DOCTEST_CONFIG_WITH_VARIADIC_MACROS
-
-#define DOCTEST_STRIP_PARENS(x) x
-#define DOCTEST_HANDLE_BRACED_VA_ARGS(expr) DOCTEST_STRIP_PARENS(DOCTEST_EXPAND_VA_ARGS expr)
-
-// registers the test by initializing a dummy var with a function
-#define DOCTEST_REGISTER_FUNCTION(f, decorators)                                                   \
-    DOCTEST_GLOBAL_NO_WARNINGS(DOCTEST_ANONYMOUS(_DOCTEST_ANON_VAR_)) = doctest::detail::regTest(  \
-            doctest::detail::TestCase(f, __FILE__, __LINE__,                                       \
-                                      doctest_detail_test_suite_ns::getCurrentTestSuite()) *       \
-            decorators);                                                                           \
-    DOCTEST_GLOBAL_NO_WARNINGS_END()
-
-#define DOCTEST_IMPLEMENT_FIXTURE(der, base, func, decorators)                                     \
-    namespace                                                                                      \
-    {                                                                                              \
-        struct der : base                                                                          \
-        { void f(); };                                                                             \
-        static void func() {                                                                       \
-            der v;                                                                                 \
-            v.f();                                                                                 \
-        }                                                                                          \
-        DOCTEST_REGISTER_FUNCTION(func, decorators)                                                \
-    }                                                                                              \
-    inline DOCTEST_NOINLINE void der::f()
-
-#define DOCTEST_CREATE_AND_REGISTER_FUNCTION(f, decorators)                                        \
-    static void f();                                                                               \
-    DOCTEST_REGISTER_FUNCTION(f, decorators)                                                       \
-    static void f()
-
-// for registering tests
-#define DOCTEST_TEST_CASE(decorators)                                                              \
-    DOCTEST_CREATE_AND_REGISTER_FUNCTION(DOCTEST_ANONYMOUS(_DOCTEST_ANON_FUNC_), decorators)
-
-// for registering tests with a fixture
-#define DOCTEST_TEST_CASE_FIXTURE(c, decorators)                                                   \
-    DOCTEST_IMPLEMENT_FIXTURE(DOCTEST_ANONYMOUS(_DOCTEST_ANON_CLASS_), c,                          \
-                              DOCTEST_ANONYMOUS(_DOCTEST_ANON_FUNC_), decorators)
-
-// for converting types to strings without the <typeinfo> header and demangling
-#ifdef DOCTEST_CONFIG_WITH_VARIADIC_MACROS
-#define DOCTEST_TYPE_TO_STRING_IMPL(...)                                                           \
-    template <>                                                                                    \
-    inline const char* type_to_string<__VA_ARGS__>() {                                             \
-        return "<" #__VA_ARGS__ ">";                                                               \
-    }
-#define DOCTEST_TYPE_TO_STRING(...)                                                                \
-    namespace doctest                                                                              \
-    {                                                                                              \
-        namespace detail                                                                           \
-        { DOCTEST_TYPE_TO_STRING_IMPL(__VA_ARGS__) }                                               \
-    }                                                                                              \
-    typedef int DOCTEST_ANONYMOUS(_DOCTEST_ANON_FOR_SEMICOLON_)
-#else // DOCTEST_CONFIG_WITH_VARIADIC_MACROS
-#define DOCTEST_TYPE_TO_STRING_IMPL(x)                                                             \
-    template <>                                                                                    \
-    inline const char* type_to_string<x>() {                                                       \
-        return "<" #x ">";                                                                         \
-    }
-#define DOCTEST_TYPE_TO_STRING(x)                                                                  \
-    namespace doctest                                                                              \
-    {                                                                                              \
-        namespace detail                                                                           \
-        { DOCTEST_TYPE_TO_STRING_IMPL(x) }                                                         \
-    }                                                                                              \
-    typedef int DOCTEST_ANONYMOUS(_DOCTEST_ANON_FOR_SEMICOLON_)
-#endif // DOCTEST_CONFIG_WITH_VARIADIC_MACROS
-
-// for typed tests
-#define DOCTEST_TEST_CASE_TEMPLATE_IMPL(decorators, T, types, anon)                                \
-    template <typename T>                                                                          \
-    inline void anon();                                                                            \
-    struct DOCTEST_CAT(anon, FUNCTOR)                                                              \
-    {                                                                                              \
-        template <int Index, typename Type>                                                        \
-        void          operator()() {                                                               \
-            doctest::detail::regTest(                                                              \
-                    doctest::detail::TestCase(anon<Type>, __FILE__, __LINE__,                      \
-                                              doctest_detail_test_suite_ns::getCurrentTestSuite(), \
-                                              doctest::detail::type_to_string<Type>(), Index) *    \
-                    decorators);                                                                   \
-        }                                                                                          \
-    };                                                                                             \
-    inline int DOCTEST_CAT(anon, REG_FUNC)() {                                                     \
-        DOCTEST_CAT(anon, FUNCTOR) registrar;                                                      \
-        doctest::detail::ForEachType<DOCTEST_HANDLE_BRACED_VA_ARGS(types)::Result,                 \
-                                     DOCTEST_CAT(anon, FUNCTOR)>                                   \
-                doIt(registrar);                                                                   \
-        return 0;                                                                                  \
-    }                                                                                              \
-    DOCTEST_GLOBAL_NO_WARNINGS(DOCTEST_CAT(anon, DUMMY)) = DOCTEST_CAT(anon, REG_FUNC)();          \
-    DOCTEST_GLOBAL_NO_WARNINGS_END()                                                               \
-    template <typename T>                                                                          \
-    inline void anon()
-
-#ifdef DOCTEST_CONFIG_WITH_VARIADIC_MACROS
-#define DOCTEST_TEST_CASE_TEMPLATE(decorators, T, ...)                                             \
-    DOCTEST_TEST_CASE_TEMPLATE_IMPL(decorators, T, (__VA_ARGS__),                                  \
-                                    DOCTEST_ANONYMOUS(_DOCTEST_ANON_TMP_))
-#else // DOCTEST_CONFIG_WITH_VARIADIC_MACROS
-#define DOCTEST_TEST_CASE_TEMPLATE(decorators, T, types)                                           \
-    DOCTEST_TEST_CASE_TEMPLATE_IMPL(decorators, T, types, DOCTEST_ANONYMOUS(_DOCTEST_ANON_TMP_))
-#endif // DOCTEST_CONFIG_WITH_VARIADIC_MACROS
-
-#define DOCTEST_TEST_CASE_TEMPLATE_DEFINE_IMPL(decorators, T, id, anon)                            \
-    template <typename T>                                                                          \
-    inline void anon();                                                                            \
-    struct DOCTEST_CAT(id, _FUNCTOR)                                                               \
-    {                                                                                              \
-        int m_line;                                                                                \
-        DOCTEST_CAT(id, _FUNCTOR)                                                                  \
-        (int line)                                                                                 \
-                : m_line(line) {}                                                                  \
-        template <int Index, typename Type>                                                        \
-        void          operator()() {                                                               \
-            doctest::detail::regTest(                                                              \
-                    doctest::detail::TestCase(anon<Type>, __FILE__, __LINE__,                      \
-                                              doctest_detail_test_suite_ns::getCurrentTestSuite(), \
-                                              doctest::detail::type_to_string<Type>(),             \
-                                              m_line * 1000 + Index) *                             \
-                    decorators);                                                                   \
-        }                                                                                          \
-    };                                                                                             \
-    template <typename T>                                                                          \
-    inline void anon()
-
-#define DOCTEST_TEST_CASE_TEMPLATE_DEFINE(decorators, T, id)                                       \
-    DOCTEST_TEST_CASE_TEMPLATE_DEFINE_IMPL(decorators, T, id, DOCTEST_ANONYMOUS(_DOCTEST_ANON_TMP_))
-
-#define DOCTEST_TEST_CASE_TEMPLATE_INSTANTIATE_IMPL(id, types, anon)                               \
-    static int DOCTEST_CAT(anon, REG_FUNC)() {                                                     \
-        DOCTEST_CAT(id, _FUNCTOR) registrar(__LINE__);                                             \
-        doctest::detail::ForEachType<DOCTEST_HANDLE_BRACED_VA_ARGS(types)::Result,                 \
-                                     DOCTEST_CAT(id, _FUNCTOR)>                                    \
-                doIt(registrar);                                                                   \
-        return 0;                                                                                  \
-    }                                                                                              \
-    DOCTEST_GLOBAL_NO_WARNINGS(DOCTEST_CAT(anon, DUMMY)) = DOCTEST_CAT(anon, REG_FUNC)();          \
-    DOCTEST_GLOBAL_NO_WARNINGS_END() typedef int DOCTEST_ANONYMOUS(_DOCTEST_ANON_FOR_SEMICOLON_)
-
-#ifdef DOCTEST_CONFIG_WITH_VARIADIC_MACROS
-#define DOCTEST_TEST_CASE_TEMPLATE_INSTANTIATE(id, ...)                                            \
-    DOCTEST_TEST_CASE_TEMPLATE_INSTANTIATE_IMPL(id, (__VA_ARGS__),                                 \
-                                                DOCTEST_ANONYMOUS(_DOCTEST_ANON_TMP_))
-#else // DOCTEST_CONFIG_WITH_VARIADIC_MACROS
-#define DOCTEST_TEST_CASE_TEMPLATE_INSTANTIATE(id, types)                                          \
-    DOCTEST_TEST_CASE_TEMPLATE_INSTANTIATE_IMPL(id, types, DOCTEST_ANONYMOUS(_DOCTEST_ANON_TMP_))
-#endif // DOCTEST_CONFIG_WITH_VARIADIC_MACROS
-
-// for subcases
-#if defined(__GNUC__)
-#define DOCTEST_SUBCASE(name)                                                                      \
-    if(const doctest::detail::Subcase & DOCTEST_ANONYMOUS(_DOCTEST_ANON_SUBCASE_)                  \
-                                                __attribute__((unused)) =                          \
-               doctest::detail::Subcase(name, __FILE__, __LINE__))
-#else // __GNUC__
-#define DOCTEST_SUBCASE(name)                                                                      \
-    if(const doctest::detail::Subcase & DOCTEST_ANONYMOUS(_DOCTEST_ANON_SUBCASE_) =                \
-               doctest::detail::Subcase(name, __FILE__, __LINE__))
-#endif // __GNUC__
-
-// for grouping tests in test suites by using code blocks
-#define DOCTEST_TEST_SUITE_IMPL(decorators, ns_name)                                               \
-    namespace ns_name                                                                              \
-    {                                                                                              \
-        namespace doctest_detail_test_suite_ns                                                     \
-        {                                                                                          \
-            inline DOCTEST_NOINLINE doctest::detail::TestSuite& getCurrentTestSuite() {            \
-                static doctest::detail::TestSuite data;                                            \
-                static bool                       inited = false;                                  \
-                if(!inited) {                                                                      \
-                    data* decorators;                                                              \
-                    inited = true;                                                                 \
-                }                                                                                  \
-                return data;                                                                       \
-            }                                                                                      \
-        }                                                                                          \
-    }                                                                                              \
-    namespace ns_name
-
-#define DOCTEST_TEST_SUITE(decorators)                                                             \
-    DOCTEST_TEST_SUITE_IMPL(decorators, DOCTEST_ANONYMOUS(_DOCTEST_ANON_SUITE_))
-
-// for starting a testsuite block
-#define DOCTEST_TEST_SUITE_BEGIN(decorators)                                                       \
-    DOCTEST_GLOBAL_NO_WARNINGS(DOCTEST_ANONYMOUS(_DOCTEST_ANON_VAR_)) =                            \
-            doctest::detail::setTestSuite(doctest::detail::TestSuite() * decorators);              \
-    DOCTEST_GLOBAL_NO_WARNINGS_END()                                                               \
-    typedef int DOCTEST_ANONYMOUS(_DOCTEST_ANON_FOR_SEMICOLON_)
-
-// for ending a testsuite block
-#define DOCTEST_TEST_SUITE_END                                                                     \
-    DOCTEST_GLOBAL_NO_WARNINGS(DOCTEST_ANONYMOUS(_DOCTEST_ANON_VAR_)) =                            \
-            doctest::detail::setTestSuite(doctest::detail::TestSuite() * "");                      \
-    DOCTEST_GLOBAL_NO_WARNINGS_END()                                                               \
-    typedef int DOCTEST_ANONYMOUS(_DOCTEST_ANON_FOR_SEMICOLON_)
-
-// for registering exception translators
-#define DOCTEST_REGISTER_EXCEPTION_TRANSLATOR_IMPL(translatorName, signature)                      \
-    static doctest::String translatorName(signature);                                              \
-    DOCTEST_GLOBAL_NO_WARNINGS(DOCTEST_ANONYMOUS(_DOCTEST_ANON_TRANSLATOR_)) =                     \
-            doctest::registerExceptionTranslator(translatorName);                                  \
-    DOCTEST_GLOBAL_NO_WARNINGS_END()                                                               \
-    static doctest::String translatorName(signature)
-
-#define DOCTEST_REGISTER_EXCEPTION_TRANSLATOR(signature)                                           \
-    DOCTEST_REGISTER_EXCEPTION_TRANSLATOR_IMPL(DOCTEST_ANONYMOUS(_DOCTEST_ANON_TRANSLATOR_),       \
-                                               signature)
-
-// for logging
-#define DOCTEST_INFO(x)                                                                            \
-    doctest::detail::ContextScope DOCTEST_ANONYMOUS(_DOCTEST_CAPTURE_)(                            \
-            doctest::detail::ContextBuilder() << x)
-#define DOCTEST_CAPTURE(x) DOCTEST_INFO(#x " := " << x)
-
-#define DOCTEST_ADD_AT_IMPL(type, file, line, mb, x)                                               \
-    do {                                                                                           \
-        doctest::detail::MessageBuilder mb(file, line, doctest::detail::assertType::type);         \
-        mb << x;                                                                                   \
-        if(mb.log())                                                                               \
-            DOCTEST_BREAK_INTO_DEBUGGER();                                                         \
-        mb.react();                                                                                \
-    } while((void)0, 0)
-
-// clang-format off
-#define DOCTEST_ADD_MESSAGE_AT(file, line, x) DOCTEST_ADD_AT_IMPL(is_warn, file, line, DOCTEST_ANONYMOUS(_DOCTEST_MESSAGE_), x)
-#define DOCTEST_ADD_FAIL_CHECK_AT(file, line, x) DOCTEST_ADD_AT_IMPL(is_check, file, line, DOCTEST_ANONYMOUS(_DOCTEST_MESSAGE_), x)
-#define DOCTEST_ADD_FAIL_AT(file, line, x) DOCTEST_ADD_AT_IMPL(is_require, file, line, DOCTEST_ANONYMOUS(_DOCTEST_MESSAGE_), x)
-// clang-format on
-
-#define DOCTEST_MESSAGE(x) DOCTEST_ADD_MESSAGE_AT(__FILE__, __LINE__, x)
-#define DOCTEST_FAIL_CHECK(x) DOCTEST_ADD_FAIL_CHECK_AT(__FILE__, __LINE__, x)
-#define DOCTEST_FAIL(x) DOCTEST_ADD_FAIL_AT(__FILE__, __LINE__, x)
-
-#if __cplusplus >= 201402L || (defined(_MSC_VER) && _MSC_VER >= 1910)
-template <class T, T x>
-constexpr T to_lvalue = x;
-#define DOCTEST_TO_LVALUE(...) to_lvalue<decltype(__VA_ARGS__), __VA_ARGS__>
-#else
-#ifdef DOCTEST_CONFIG_WITH_VARIADIC_MACROS
-#define DOCTEST_TO_LVALUE(...) TO_LVALUE_CAN_BE_USED_ONLY_IN_CPP14_MODE_OR_WITH_VS_2017_OR_NEWER
-#else // DOCTEST_CONFIG_WITH_VARIADIC_MACROS
-#define DOCTEST_TO_LVALUE(x) TO_LVALUE_CAN_BE_USED_ONLY_IN_CPP14_MODE_OR_WITH_VS_2017_OR_NEWER
-#endif // DOCTEST_CONFIG_WITH_VARIADIC_MACROS
-#endif // TO_LVALUE hack for logging macros like INFO()
-
-// common code in asserts - for convenience
-#define DOCTEST_ASSERT_LOG_AND_REACT(rb)                                                           \
-    if(rb.log())                                                                                   \
-        DOCTEST_BREAK_INTO_DEBUGGER();                                                             \
-    rb.react()
-
-#ifdef DOCTEST_CONFIG_NO_TRY_CATCH_IN_ASSERTS
-#define DOCTEST_WRAP_IN_TRY(x) x;
-#else // DOCTEST_CONFIG_NO_TRY_CATCH_IN_ASSERTS
-#define DOCTEST_WRAP_IN_TRY(x)                                                                     \
-    try {                                                                                          \
-        x;                                                                                         \
-    } catch(...) { _DOCTEST_RB.unexpectedExceptionOccurred(); }
-#endif // DOCTEST_CONFIG_NO_TRY_CATCH_IN_ASSERTS
-
-#define DOCTEST_ASSERT_IMPLEMENT_3(expr, assert_type)                                              \
-    doctest::detail::ResultBuilder _DOCTEST_RB(                                                    \
-            doctest::detail::assertType::assert_type, __FILE__, __LINE__,                          \
-            DOCTEST_TOSTR(DOCTEST_HANDLE_BRACED_VA_ARGS(expr)));                                   \
-    DOCTEST_WRAP_IN_TRY(_DOCTEST_RB.setResult(                                                     \
-            doctest::detail::ExpressionDecomposer(doctest::detail::assertType::assert_type)        \
-            << DOCTEST_HANDLE_BRACED_VA_ARGS(expr)))                                               \
-    DOCTEST_ASSERT_LOG_AND_REACT(_DOCTEST_RB)
-
-#if defined(__clang__)
-#define DOCTEST_ASSERT_IMPLEMENT_2(expr, assert_type)                                              \
-    _Pragma("clang diagnostic push")                                                               \
-            _Pragma("clang diagnostic ignored \"-Woverloaded-shift-op-parentheses\"")              \
-                    DOCTEST_ASSERT_IMPLEMENT_3(expr, assert_type);                                 \
-    _Pragma("clang diagnostic pop")
-#else // __clang__
-#define DOCTEST_ASSERT_IMPLEMENT_2(expr, assert_type) DOCTEST_ASSERT_IMPLEMENT_3(expr, assert_type);
-#endif // __clang__
-
-#define DOCTEST_ASSERT_IMPLEMENT_1(expr, assert_type)                                              \
-    do {                                                                                           \
-        DOCTEST_ASSERT_IMPLEMENT_2(expr, assert_type);                                             \
-    } while((void)0, 0)
-
-#ifdef DOCTEST_CONFIG_WITH_VARIADIC_MACROS
-#define DOCTEST_WARN(...) DOCTEST_ASSERT_IMPLEMENT_1((__VA_ARGS__), DT_WARN)
-#define DOCTEST_CHECK(...) DOCTEST_ASSERT_IMPLEMENT_1((__VA_ARGS__), DT_CHECK)
-#define DOCTEST_REQUIRE(...) DOCTEST_ASSERT_IMPLEMENT_1((__VA_ARGS__), DT_REQUIRE)
-#define DOCTEST_WARN_FALSE(...) DOCTEST_ASSERT_IMPLEMENT_1((__VA_ARGS__), DT_WARN_FALSE)
-#define DOCTEST_CHECK_FALSE(...) DOCTEST_ASSERT_IMPLEMENT_1((__VA_ARGS__), DT_CHECK_FALSE)
-#define DOCTEST_REQUIRE_FALSE(...) DOCTEST_ASSERT_IMPLEMENT_1((__VA_ARGS__), DT_REQUIRE_FALSE)
-#else // DOCTEST_CONFIG_WITH_VARIADIC_MACROS
-#define DOCTEST_WARN(expr) DOCTEST_ASSERT_IMPLEMENT_1(expr, DT_WARN)
-#define DOCTEST_CHECK(expr) DOCTEST_ASSERT_IMPLEMENT_1(expr, DT_CHECK)
-#define DOCTEST_REQUIRE(expr) DOCTEST_ASSERT_IMPLEMENT_1(expr, DT_REQUIRE)
-#define DOCTEST_WARN_FALSE(expr) DOCTEST_ASSERT_IMPLEMENT_1(expr, DT_WARN_FALSE)
-#define DOCTEST_CHECK_FALSE(expr) DOCTEST_ASSERT_IMPLEMENT_1(expr, DT_CHECK_FALSE)
-#define DOCTEST_REQUIRE_FALSE(expr) DOCTEST_ASSERT_IMPLEMENT_1(expr, DT_REQUIRE_FALSE)
-#endif // DOCTEST_CONFIG_WITH_VARIADIC_MACROS
-
-// clang-format off
-#ifdef DOCTEST_CONFIG_WITH_VARIADIC_MACROS
-#define DOCTEST_WARN_MESSAGE(cond, msg) do { DOCTEST_INFO(msg); DOCTEST_ASSERT_IMPLEMENT_2((cond), DT_WARN); } while((void)0, 0)
-#define DOCTEST_CHECK_MESSAGE(cond, msg) do { DOCTEST_INFO(msg); DOCTEST_ASSERT_IMPLEMENT_2((cond), DT_CHECK); } while((void)0, 0)
-#define DOCTEST_REQUIRE_MESSAGE(cond, msg) do { DOCTEST_INFO(msg); DOCTEST_ASSERT_IMPLEMENT_2((cond), DT_REQUIRE); } while((void)0, 0)
-#define DOCTEST_WARN_FALSE_MESSAGE(cond, msg) do { DOCTEST_INFO(msg); DOCTEST_ASSERT_IMPLEMENT_2((cond), DT_WARN_FALSE); } while((void)0, 0)
-#define DOCTEST_CHECK_FALSE_MESSAGE(cond, msg) do { DOCTEST_INFO(msg); DOCTEST_ASSERT_IMPLEMENT_2((cond), DT_CHECK_FALSE); } while((void)0, 0)
-#define DOCTEST_REQUIRE_FALSE_MESSAGE(cond, msg) do { DOCTEST_INFO(msg); DOCTEST_ASSERT_IMPLEMENT_2((cond), DT_REQUIRE_FALSE); } while((void)0, 0)
-#else // DOCTEST_CONFIG_WITH_VARIADIC_MACROS
-#define DOCTEST_WARN_MESSAGE(cond, msg) do { DOCTEST_INFO(msg); DOCTEST_ASSERT_IMPLEMENT_2(cond, DT_WARN); } while((void)0, 0)
-#define DOCTEST_CHECK_MESSAGE(cond, msg) do { DOCTEST_INFO(msg); DOCTEST_ASSERT_IMPLEMENT_2(cond, DT_CHECK); } while((void)0, 0)
-#define DOCTEST_REQUIRE_MESSAGE(cond, msg) do { DOCTEST_INFO(msg); DOCTEST_ASSERT_IMPLEMENT_2(cond, DT_REQUIRE); } while((void)0, 0)
-#define DOCTEST_WARN_FALSE_MESSAGE(cond, msg) do { DOCTEST_INFO(msg); DOCTEST_ASSERT_IMPLEMENT_2(cond, DT_WARN_FALSE); } while((void)0, 0)
-#define DOCTEST_CHECK_FALSE_MESSAGE(cond, msg) do { DOCTEST_INFO(msg); DOCTEST_ASSERT_IMPLEMENT_2(cond, DT_CHECK_FALSE); } while((void)0, 0)
-#define DOCTEST_REQUIRE_FALSE_MESSAGE(cond, msg) do { DOCTEST_INFO(msg); DOCTEST_ASSERT_IMPLEMENT_2(cond, DT_REQUIRE_FALSE); } while((void)0, 0)
-#endif // DOCTEST_CONFIG_WITH_VARIADIC_MACROS
-// clang-format on
-
-#define DOCTEST_ASSERT_THROWS(expr, assert_type)                                                   \
-    do {                                                                                           \
-        if(!doctest::detail::getTestsContextState()->no_throw) {                                   \
-            doctest::detail::ResultBuilder _DOCTEST_RB(doctest::detail::assertType::assert_type,   \
-                                                       __FILE__, __LINE__, #expr);                 \
-            try {                                                                                  \
-                expr;                                                                              \
-            } catch(...) { _DOCTEST_RB.m_threw = true; }                                           \
-            DOCTEST_ASSERT_LOG_AND_REACT(_DOCTEST_RB);                                             \
-        }                                                                                          \
-    } while((void)0, 0)
-
-#define DOCTEST_ASSERT_THROWS_AS(expr, as, assert_type)                                            \
-    do {                                                                                           \
-        if(!doctest::detail::getTestsContextState()->no_throw) {                                   \
-            doctest::detail::ResultBuilder _DOCTEST_RB(                                            \
-                    doctest::detail::assertType::assert_type, __FILE__, __LINE__, #expr,           \
-                    DOCTEST_TOSTR(DOCTEST_HANDLE_BRACED_VA_ARGS(as)));                             \
-            try {                                                                                  \
-                expr;                                                                              \
-            } catch(const DOCTEST_HANDLE_BRACED_VA_ARGS(as)&) {                                    \
-                _DOCTEST_RB.m_threw    = true;                                                     \
-                _DOCTEST_RB.m_threw_as = true;                                                     \
-            } catch(...) { _DOCTEST_RB.unexpectedExceptionOccurred(); }                            \
-            DOCTEST_ASSERT_LOG_AND_REACT(_DOCTEST_RB);                                             \
-        }                                                                                          \
-    } while((void)0, 0)
-
-#define DOCTEST_ASSERT_NOTHROW(expr, assert_type)                                                  \
-    do {                                                                                           \
-        if(!doctest::detail::getTestsContextState()->no_throw) {                                   \
-            doctest::detail::ResultBuilder _DOCTEST_RB(doctest::detail::assertType::assert_type,   \
-                                                       __FILE__, __LINE__, #expr);                 \
-            try {                                                                                  \
-                expr;                                                                              \
-            } catch(...) { _DOCTEST_RB.unexpectedExceptionOccurred(); }                            \
-            DOCTEST_ASSERT_LOG_AND_REACT(_DOCTEST_RB);                                             \
-        }                                                                                          \
-    } while((void)0, 0)
-
-#define DOCTEST_WARN_THROWS(expr) DOCTEST_ASSERT_THROWS(expr, DT_WARN_THROWS)
-#define DOCTEST_CHECK_THROWS(expr) DOCTEST_ASSERT_THROWS(expr, DT_CHECK_THROWS)
-#define DOCTEST_REQUIRE_THROWS(expr) DOCTEST_ASSERT_THROWS(expr, DT_REQUIRE_THROWS)
-
-// clang-format off
-#ifdef DOCTEST_CONFIG_WITH_VARIADIC_MACROS
-#define DOCTEST_WARN_THROWS_AS(expr, ...) DOCTEST_ASSERT_THROWS_AS(expr, (__VA_ARGS__), DT_WARN_THROWS_AS)
-#define DOCTEST_CHECK_THROWS_AS(expr, ...) DOCTEST_ASSERT_THROWS_AS(expr, (__VA_ARGS__), DT_CHECK_THROWS_AS)
-#define DOCTEST_REQUIRE_THROWS_AS(expr, ...) DOCTEST_ASSERT_THROWS_AS(expr, (__VA_ARGS__), DT_REQUIRE_THROWS_AS)
-#else // DOCTEST_CONFIG_WITH_VARIADIC_MACROS
-#define DOCTEST_WARN_THROWS_AS(expr, ex) DOCTEST_ASSERT_THROWS_AS(expr, ex, DT_WARN_THROWS_AS)
-#define DOCTEST_CHECK_THROWS_AS(expr, ex) DOCTEST_ASSERT_THROWS_AS(expr, ex, DT_CHECK_THROWS_AS)
-#define DOCTEST_REQUIRE_THROWS_AS(expr, ex) DOCTEST_ASSERT_THROWS_AS(expr, ex, DT_REQUIRE_THROWS_AS)
-#endif // DOCTEST_CONFIG_WITH_VARIADIC_MACROS
-// clang-format on
-
-#define DOCTEST_WARN_NOTHROW(expr) DOCTEST_ASSERT_NOTHROW(expr, DT_WARN_NOTHROW)
-#define DOCTEST_CHECK_NOTHROW(expr) DOCTEST_ASSERT_NOTHROW(expr, DT_CHECK_NOTHROW)
-#define DOCTEST_REQUIRE_NOTHROW(expr) DOCTEST_ASSERT_NOTHROW(expr, DT_REQUIRE_NOTHROW)
-
-// clang-format off
-#define DOCTEST_WARN_THROWS_MESSAGE(expr, msg) do { DOCTEST_INFO(msg); DOCTEST_WARN_THROWS(expr); } while((void)0, 0)
-#define DOCTEST_CHECK_THROWS_MESSAGE(expr, msg) do { DOCTEST_INFO(msg); DOCTEST_CHECK_THROWS(expr); } while((void)0, 0)
-#define DOCTEST_REQUIRE_THROWS_MESSAGE(expr, msg) do { DOCTEST_INFO(msg); DOCTEST_REQUIRE_THROWS(expr); } while((void)0, 0)
-#define DOCTEST_WARN_THROWS_AS_MESSAGE(expr, ex, msg) do { DOCTEST_INFO(msg); DOCTEST_WARN_THROWS_AS(expr, ex); } while((void)0, 0)
-#define DOCTEST_CHECK_THROWS_AS_MESSAGE(expr, ex, msg) do { DOCTEST_INFO(msg); DOCTEST_CHECK_THROWS_AS(expr, ex); } while((void)0, 0)
-#define DOCTEST_REQUIRE_THROWS_AS_MESSAGE(expr, ex, msg) do { DOCTEST_INFO(msg); DOCTEST_REQUIRE_THROWS_AS(expr, ex); } while((void)0, 0)
-#define DOCTEST_WARN_NOTHROW_MESSAGE(expr, msg) do { DOCTEST_INFO(msg); DOCTEST_WARN_NOTHROW(expr); } while((void)0, 0)
-#define DOCTEST_CHECK_NOTHROW_MESSAGE(expr, msg) do { DOCTEST_INFO(msg); DOCTEST_CHECK_NOTHROW(expr); } while((void)0, 0)
-#define DOCTEST_REQUIRE_NOTHROW_MESSAGE(expr, msg) do { DOCTEST_INFO(msg); DOCTEST_REQUIRE_NOTHROW(expr); } while((void)0, 0)
-// clang-format on
-
-#ifdef DOCTEST_CONFIG_WITH_VARIADIC_MACROS
-#define DOCTEST_BINARY_ASSERT(assert_type, expr, comp)                                             \
-    do {                                                                                           \
-        doctest::detail::ResultBuilder _DOCTEST_RB(                                                \
-                doctest::detail::assertType::assert_type, __FILE__, __LINE__,                      \
-                DOCTEST_TOSTR(DOCTEST_HANDLE_BRACED_VA_ARGS(expr)));                               \
-        DOCTEST_WRAP_IN_TRY(                                                                       \
-                _DOCTEST_RB.binary_assert<doctest::detail::binaryAssertComparison::comp>(          \
-                        DOCTEST_HANDLE_BRACED_VA_ARGS(expr)))                                      \
-        DOCTEST_ASSERT_LOG_AND_REACT(_DOCTEST_RB);                                                 \
-    } while((void)0, 0)
-#else // DOCTEST_CONFIG_WITH_VARIADIC_MACROS
-#define DOCTEST_BINARY_ASSERT(assert_type, lhs, rhs, comp)                                         \
-    do {                                                                                           \
-        doctest::detail::ResultBuilder _DOCTEST_RB(doctest::detail::assertType::assert_type,       \
-                                                   __FILE__, __LINE__, #lhs ", " #rhs);            \
-        DOCTEST_WRAP_IN_TRY(                                                                       \
-                _DOCTEST_RB.binary_assert<doctest::detail::binaryAssertComparison::comp>(lhs,      \
-                                                                                         rhs))     \
-        DOCTEST_ASSERT_LOG_AND_REACT(_DOCTEST_RB);                                                 \
-    } while((void)0, 0)
-#endif // DOCTEST_CONFIG_WITH_VARIADIC_MACROS
-
-#define DOCTEST_UNARY_ASSERT(assert_type, expr)                                                    \
-    do {                                                                                           \
-        doctest::detail::ResultBuilder _DOCTEST_RB(                                                \
-                doctest::detail::assertType::assert_type, __FILE__, __LINE__,                      \
-                DOCTEST_TOSTR(DOCTEST_HANDLE_BRACED_VA_ARGS(expr)));                               \
-        DOCTEST_WRAP_IN_TRY(_DOCTEST_RB.unary_assert(DOCTEST_HANDLE_BRACED_VA_ARGS(expr)))         \
-        DOCTEST_ASSERT_LOG_AND_REACT(_DOCTEST_RB);                                                 \
-    } while((void)0, 0)
-
-#ifdef DOCTEST_CONFIG_WITH_VARIADIC_MACROS
-#define DOCTEST_WARN_EQ(...) DOCTEST_BINARY_ASSERT(DT_WARN_EQ, (__VA_ARGS__), eq)
-#define DOCTEST_CHECK_EQ(...) DOCTEST_BINARY_ASSERT(DT_CHECK_EQ, (__VA_ARGS__), eq)
-#define DOCTEST_REQUIRE_EQ(...) DOCTEST_BINARY_ASSERT(DT_REQUIRE_EQ, (__VA_ARGS__), eq)
-#define DOCTEST_WARN_NE(...) DOCTEST_BINARY_ASSERT(DT_WARN_NE, (__VA_ARGS__), ne)
-#define DOCTEST_CHECK_NE(...) DOCTEST_BINARY_ASSERT(DT_CHECK_NE, (__VA_ARGS__), ne)
-#define DOCTEST_REQUIRE_NE(...) DOCTEST_BINARY_ASSERT(DT_REQUIRE_NE, (__VA_ARGS__), ne)
-#define DOCTEST_WARN_GT(...) DOCTEST_BINARY_ASSERT(DT_WARN_GT, (__VA_ARGS__), gt)
-#define DOCTEST_CHECK_GT(...) DOCTEST_BINARY_ASSERT(DT_CHECK_GT, (__VA_ARGS__), gt)
-#define DOCTEST_REQUIRE_GT(...) DOCTEST_BINARY_ASSERT(DT_REQUIRE_GT, (__VA_ARGS__), gt)
-#define DOCTEST_WARN_LT(...) DOCTEST_BINARY_ASSERT(DT_WARN_LT, (__VA_ARGS__), lt)
-#define DOCTEST_CHECK_LT(...) DOCTEST_BINARY_ASSERT(DT_CHECK_LT, (__VA_ARGS__), lt)
-#define DOCTEST_REQUIRE_LT(...) DOCTEST_BINARY_ASSERT(DT_REQUIRE_LT, (__VA_ARGS__), lt)
-#define DOCTEST_WARN_GE(...) DOCTEST_BINARY_ASSERT(DT_WARN_GE, (__VA_ARGS__), ge)
-#define DOCTEST_CHECK_GE(...) DOCTEST_BINARY_ASSERT(DT_CHECK_GE, (__VA_ARGS__), ge)
-#define DOCTEST_REQUIRE_GE(...) DOCTEST_BINARY_ASSERT(DT_REQUIRE_GE, (__VA_ARGS__), ge)
-#define DOCTEST_WARN_LE(...) DOCTEST_BINARY_ASSERT(DT_WARN_LE, (__VA_ARGS__), le)
-#define DOCTEST_CHECK_LE(...) DOCTEST_BINARY_ASSERT(DT_CHECK_LE, (__VA_ARGS__), le)
-#define DOCTEST_REQUIRE_LE(...) DOCTEST_BINARY_ASSERT(DT_REQUIRE_LE, (__VA_ARGS__), le)
-
-#define DOCTEST_WARN_UNARY(...) DOCTEST_UNARY_ASSERT(DT_WARN_UNARY, (__VA_ARGS__))
-#define DOCTEST_CHECK_UNARY(...) DOCTEST_UNARY_ASSERT(DT_CHECK_UNARY, (__VA_ARGS__))
-#define DOCTEST_REQUIRE_UNARY(...) DOCTEST_UNARY_ASSERT(DT_REQUIRE_UNARY, (__VA_ARGS__))
-#define DOCTEST_WARN_UNARY_FALSE(...) DOCTEST_UNARY_ASSERT(DT_WARN_UNARY_FALSE, (__VA_ARGS__))
-#define DOCTEST_CHECK_UNARY_FALSE(...) DOCTEST_UNARY_ASSERT(DT_CHECK_UNARY_FALSE, (__VA_ARGS__))
-#define DOCTEST_REQUIRE_UNARY_FALSE(...) DOCTEST_UNARY_ASSERT(DT_REQUIRE_UNARY_FALSE, (__VA_ARGS__))
-#else // DOCTEST_CONFIG_WITH_VARIADIC_MACROS
-#define DOCTEST_WARN_EQ(lhs, rhs) DOCTEST_BINARY_ASSERT(DT_WARN_EQ, lhs, rhs, eq)
-#define DOCTEST_CHECK_EQ(lhs, rhs) DOCTEST_BINARY_ASSERT(DT_CHECK_EQ, lhs, rhs, eq)
-#define DOCTEST_REQUIRE_EQ(lhs, rhs) DOCTEST_BINARY_ASSERT(DT_REQUIRE_EQ, lhs, rhs, eq)
-#define DOCTEST_WARN_NE(lhs, rhs) DOCTEST_BINARY_ASSERT(DT_WARN_NE, lhs, rhs, ne)
-#define DOCTEST_CHECK_NE(lhs, rhs) DOCTEST_BINARY_ASSERT(DT_CHECK_NE, lhs, rhs, ne)
-#define DOCTEST_REQUIRE_NE(lhs, rhs) DOCTEST_BINARY_ASSERT(DT_REQUIRE_NE, lhs, rhs, ne)
-#define DOCTEST_WARN_GT(lhs, rhs) DOCTEST_BINARY_ASSERT(DT_WARN_GT, lhs, rhs, gt)
-#define DOCTEST_CHECK_GT(lhs, rhs) DOCTEST_BINARY_ASSERT(DT_CHECK_GT, lhs, rhs, gt)
-#define DOCTEST_REQUIRE_GT(lhs, rhs) DOCTEST_BINARY_ASSERT(DT_REQUIRE_GT, lhs, rhs, gt)
-#define DOCTEST_WARN_LT(lhs, rhs) DOCTEST_BINARY_ASSERT(DT_WARN_LT, lhs, rhs, lt)
-#define DOCTEST_CHECK_LT(lhs, rhs) DOCTEST_BINARY_ASSERT(DT_CHECK_LT, lhs, rhs, lt)
-#define DOCTEST_REQUIRE_LT(lhs, rhs) DOCTEST_BINARY_ASSERT(DT_REQUIRE_LT, lhs, rhs, lt)
-#define DOCTEST_WARN_GE(lhs, rhs) DOCTEST_BINARY_ASSERT(DT_WARN_GE, lhs, rhs, ge)
-#define DOCTEST_CHECK_GE(lhs, rhs) DOCTEST_BINARY_ASSERT(DT_CHECK_GE, lhs, rhs, ge)
-#define DOCTEST_REQUIRE_GE(lhs, rhs) DOCTEST_BINARY_ASSERT(DT_REQUIRE_GE, lhs, rhs, ge)
-#define DOCTEST_WARN_LE(lhs, rhs) DOCTEST_BINARY_ASSERT(DT_WARN_LE, lhs, rhs, le)
-#define DOCTEST_CHECK_LE(lhs, rhs) DOCTEST_BINARY_ASSERT(DT_CHECK_LE, lhs, rhs, le)
-#define DOCTEST_REQUIRE_LE(lhs, rhs) DOCTEST_BINARY_ASSERT(DT_REQUIRE_LE, lhs, rhs, le)
-
-#define DOCTEST_WARN_UNARY(v) DOCTEST_UNARY_ASSERT(DT_WARN_UNARY, v)
-#define DOCTEST_CHECK_UNARY(v) DOCTEST_UNARY_ASSERT(DT_CHECK_UNARY, v)
-#define DOCTEST_REQUIRE_UNARY(v) DOCTEST_UNARY_ASSERT(DT_REQUIRE_UNARY, v)
-#define DOCTEST_WARN_UNARY_FALSE(v) DOCTEST_UNARY_ASSERT(DT_WARN_UNARY_FALSE, v)
-#define DOCTEST_CHECK_UNARY_FALSE(v) DOCTEST_UNARY_ASSERT(DT_CHECK_UNARY_FALSE, v)
-#define DOCTEST_REQUIRE_UNARY_FALSE(v) DOCTEST_UNARY_ASSERT(DT_REQUIRE_UNARY_FALSE, v)
-#endif // DOCTEST_CONFIG_WITH_VARIADIC_MACROS
-
-#ifndef DOCTEST_CONFIG_SUPER_FAST_ASSERTS
-
-#ifdef DOCTEST_CONFIG_WITH_VARIADIC_MACROS
-#define DOCTEST_FAST_BINARY_ASSERT(assert_type, expr, comparison)                                  \
-    do {                                                                                           \
-        int _DOCTEST_FAST_RES = doctest::detail::fast_binary_assert<                               \
-                doctest::detail::binaryAssertComparison::comparison>(                              \
-                doctest::detail::assertType::assert_type, __FILE__, __LINE__,                      \
-                DOCTEST_TOSTR(DOCTEST_HANDLE_BRACED_VA_ARGS(expr)),                                \
-                DOCTEST_HANDLE_BRACED_VA_ARGS(expr));                                              \
-        if(_DOCTEST_FAST_RES & doctest::detail::assertAction::dbgbreak)                            \
-            DOCTEST_BREAK_INTO_DEBUGGER();                                                         \
-        doctest::detail::fastAssertThrowIfFlagSet(_DOCTEST_FAST_RES);                              \
-    } while((void)0, 0)
-#else // DOCTEST_CONFIG_WITH_VARIADIC_MACROS
-#define DOCTEST_FAST_BINARY_ASSERT(assert_type, lhs, rhs, comparison)                              \
-    do {                                                                                           \
-        int _DOCTEST_FAST_RES = doctest::detail::fast_binary_assert<                               \
-                doctest::detail::binaryAssertComparison::comparison>(                              \
-                doctest::detail::assertType::assert_type, __FILE__, __LINE__, #lhs ", " #rhs, lhs, \
-                rhs);                                                                              \
-        if(_DOCTEST_FAST_RES & doctest::detail::assertAction::dbgbreak)                            \
-            DOCTEST_BREAK_INTO_DEBUGGER();                                                         \
-        doctest::detail::fastAssertThrowIfFlagSet(_DOCTEST_FAST_RES);                              \
-    } while((void)0, 0)
-#endif // DOCTEST_CONFIG_WITH_VARIADIC_MACROS
-
-#define DOCTEST_FAST_UNARY_ASSERT(assert_type, expr)                                               \
-    do {                                                                                           \
-        int _DOCTEST_FAST_RES = doctest::detail::fast_unary_assert(                                \
-                doctest::detail::assertType::assert_type, __FILE__, __LINE__,                      \
-                DOCTEST_TOSTR(DOCTEST_HANDLE_BRACED_VA_ARGS(expr)),                                \
-                DOCTEST_HANDLE_BRACED_VA_ARGS(expr));                                              \
-        if(_DOCTEST_FAST_RES & doctest::detail::assertAction::dbgbreak)                            \
-            DOCTEST_BREAK_INTO_DEBUGGER();                                                         \
-        doctest::detail::fastAssertThrowIfFlagSet(_DOCTEST_FAST_RES);                              \
-    } while((void)0, 0)
-
-#else // DOCTEST_CONFIG_SUPER_FAST_ASSERTS
-
-#ifdef DOCTEST_CONFIG_WITH_VARIADIC_MACROS
-#define DOCTEST_FAST_BINARY_ASSERT(assert_type, expr, comparison)                                  \
-    doctest::detail::fast_binary_assert<doctest::detail::binaryAssertComparison::comparison>(      \
-            doctest::detail::assertType::assert_type, __FILE__, __LINE__,                          \
-            DOCTEST_TOSTR(DOCTEST_HANDLE_BRACED_VA_ARGS(expr)),                                    \
-            DOCTEST_HANDLE_BRACED_VA_ARGS(expr))
-#else // DOCTEST_CONFIG_WITH_VARIADIC_MACROS
-#define DOCTEST_FAST_BINARY_ASSERT(assert_type, lhs, rhs, comparison)                              \
-    doctest::detail::fast_binary_assert<doctest::detail::binaryAssertComparison::comparison>(      \
-            doctest::detail::assertType::assert_type, __FILE__, __LINE__, #lhs ", " #rhs, lhs,     \
-            rhs)
-#endif // DOCTEST_CONFIG_WITH_VARIADIC_MACROS
-
-#define DOCTEST_FAST_UNARY_ASSERT(assert_type, expr)                                               \
-    doctest::detail::fast_unary_assert(doctest::detail::assertType::assert_type, __FILE__,         \
-                                       __LINE__,                                                   \
-                                       DOCTEST_TOSTR(DOCTEST_HANDLE_BRACED_VA_ARGS(expr)),         \
-                                       DOCTEST_HANDLE_BRACED_VA_ARGS(expr))
-
-#endif // DOCTEST_CONFIG_SUPER_FAST_ASSERTS
-
-// clang-format off
-#ifdef DOCTEST_CONFIG_WITH_VARIADIC_MACROS
-#define DOCTEST_FAST_WARN_EQ(...) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_WARN_EQ, (__VA_ARGS__), eq)
-#define DOCTEST_FAST_CHECK_EQ(...) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_CHECK_EQ, (__VA_ARGS__), eq)
-#define DOCTEST_FAST_REQUIRE_EQ(...) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_REQUIRE_EQ, (__VA_ARGS__), eq)
-#define DOCTEST_FAST_WARN_NE(...) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_WARN_NE, (__VA_ARGS__), ne)
-#define DOCTEST_FAST_CHECK_NE(...) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_CHECK_NE, (__VA_ARGS__), ne)
-#define DOCTEST_FAST_REQUIRE_NE(...) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_REQUIRE_NE, (__VA_ARGS__), ne)
-#define DOCTEST_FAST_WARN_GT(...) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_WARN_GT, (__VA_ARGS__), gt)
-#define DOCTEST_FAST_CHECK_GT(...) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_CHECK_GT, (__VA_ARGS__), gt)
-#define DOCTEST_FAST_REQUIRE_GT(...) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_REQUIRE_GT, (__VA_ARGS__), gt)
-#define DOCTEST_FAST_WARN_LT(...) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_WARN_LT, (__VA_ARGS__), lt)
-#define DOCTEST_FAST_CHECK_LT(...) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_CHECK_LT, (__VA_ARGS__), lt)
-#define DOCTEST_FAST_REQUIRE_LT(...) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_REQUIRE_LT, (__VA_ARGS__), lt)
-#define DOCTEST_FAST_WARN_GE(...) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_WARN_GE, (__VA_ARGS__), ge)
-#define DOCTEST_FAST_CHECK_GE(...) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_CHECK_GE, (__VA_ARGS__), ge)
-#define DOCTEST_FAST_REQUIRE_GE(...) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_REQUIRE_GE, (__VA_ARGS__), ge)
-#define DOCTEST_FAST_WARN_LE(...) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_WARN_LE, (__VA_ARGS__), le)
-#define DOCTEST_FAST_CHECK_LE(...) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_CHECK_LE, (__VA_ARGS__), le)
-#define DOCTEST_FAST_REQUIRE_LE(...) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_REQUIRE_LE, (__VA_ARGS__), le)
-
-#define DOCTEST_FAST_WARN_UNARY(...) DOCTEST_FAST_UNARY_ASSERT(DT_FAST_WARN_UNARY, (__VA_ARGS__))
-#define DOCTEST_FAST_CHECK_UNARY(...) DOCTEST_FAST_UNARY_ASSERT(DT_FAST_CHECK_UNARY, (__VA_ARGS__))
-#define DOCTEST_FAST_REQUIRE_UNARY(...) DOCTEST_FAST_UNARY_ASSERT(DT_FAST_REQUIRE_UNARY, (__VA_ARGS__))
-#define DOCTEST_FAST_WARN_UNARY_FALSE(...) DOCTEST_FAST_UNARY_ASSERT(DT_FAST_WARN_UNARY_FALSE, (__VA_ARGS__))
-#define DOCTEST_FAST_CHECK_UNARY_FALSE(...) DOCTEST_FAST_UNARY_ASSERT(DT_FAST_CHECK_UNARY_FALSE, (__VA_ARGS__))
-#define DOCTEST_FAST_REQUIRE_UNARY_FALSE(...) DOCTEST_FAST_UNARY_ASSERT(DT_FAST_REQUIRE_UNARY_FALSE, (__VA_ARGS__))
-#else // DOCTEST_CONFIG_WITH_VARIADIC_MACROS
-#define DOCTEST_FAST_WARN_EQ(l, r) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_WARN_EQ, l, r, eq)
-#define DOCTEST_FAST_CHECK_EQ(l, r) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_CHECK_EQ, l, r, eq)
-#define DOCTEST_FAST_REQUIRE_EQ(l, r) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_REQUIRE_EQ, l, r, eq)
-#define DOCTEST_FAST_WARN_NE(l, r) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_WARN_NE, l, r, ne)
-#define DOCTEST_FAST_CHECK_NE(l, r) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_CHECK_NE, l, r, ne)
-#define DOCTEST_FAST_REQUIRE_NE(l, r) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_REQUIRE_NE, l, r, ne)
-#define DOCTEST_FAST_WARN_GT(l, r) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_WARN_GT, l, r, gt)
-#define DOCTEST_FAST_CHECK_GT(l, r) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_CHECK_GT, l, r, gt)
-#define DOCTEST_FAST_REQUIRE_GT(l, r) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_REQUIRE_GT, l, r, gt)
-#define DOCTEST_FAST_WARN_LT(l, r) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_WARN_LT, l, r, lt)
-#define DOCTEST_FAST_CHECK_LT(l, r) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_CHECK_LT, l, r, lt)
-#define DOCTEST_FAST_REQUIRE_LT(l, r) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_REQUIRE_LT, l, r, lt)
-#define DOCTEST_FAST_WARN_GE(l, r) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_WARN_GE, l, r, ge)
-#define DOCTEST_FAST_CHECK_GE(l, r) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_CHECK_GE, l, r, ge)
-#define DOCTEST_FAST_REQUIRE_GE(l, r) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_REQUIRE_GE, l, r, ge)
-#define DOCTEST_FAST_WARN_LE(l, r) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_WARN_LE, l, r, le)
-#define DOCTEST_FAST_CHECK_LE(l, r) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_CHECK_LE, l, r, le)
-#define DOCTEST_FAST_REQUIRE_LE(l, r) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_REQUIRE_LE, l, r, le)
-
-#define DOCTEST_FAST_WARN_UNARY(v) DOCTEST_FAST_UNARY_ASSERT(DT_FAST_WARN_UNARY, v)
-#define DOCTEST_FAST_CHECK_UNARY(v) DOCTEST_FAST_UNARY_ASSERT(DT_FAST_CHECK_UNARY, v)
-#define DOCTEST_FAST_REQUIRE_UNARY(v) DOCTEST_FAST_UNARY_ASSERT(DT_FAST_REQUIRE_UNARY, v)
-#define DOCTEST_FAST_WARN_UNARY_FALSE(v) DOCTEST_FAST_UNARY_ASSERT(DT_FAST_WARN_UNARY_FALSE, v)
-#define DOCTEST_FAST_CHECK_UNARY_FALSE(v) DOCTEST_FAST_UNARY_ASSERT(DT_FAST_CHECK_UNARY_FALSE, v)
-#define DOCTEST_FAST_REQUIRE_UNARY_FALSE(v) DOCTEST_FAST_UNARY_ASSERT(DT_FAST_REQUIRE_UNARY_FALSE, v)
-#endif // DOCTEST_CONFIG_WITH_VARIADIC_MACROS
-// clang-format on
-
-#ifdef DOCTEST_CONFIG_NO_EXCEPTIONS
-
-#undef DOCTEST_WARN_THROWS
-#undef DOCTEST_CHECK_THROWS
-#undef DOCTEST_REQUIRE_THROWS
-#undef DOCTEST_WARN_THROWS_AS
-#undef DOCTEST_CHECK_THROWS_AS
-#undef DOCTEST_REQUIRE_THROWS_AS
-#undef DOCTEST_WARN_NOTHROW
-#undef DOCTEST_CHECK_NOTHROW
-#undef DOCTEST_REQUIRE_NOTHROW
-
-#undef DOCTEST_WARN_THROWS_MESSAGE
-#undef DOCTEST_CHECK_THROWS_MESSAGE
-#undef DOCTEST_REQUIRE_THROWS_MESSAGE
-#undef DOCTEST_WARN_THROWS_AS_MESSAGE
-#undef DOCTEST_CHECK_THROWS_AS_MESSAGE
-#undef DOCTEST_REQUIRE_THROWS_AS_MESSAGE
-#undef DOCTEST_WARN_NOTHROW_MESSAGE
-#undef DOCTEST_CHECK_NOTHROW_MESSAGE
-#undef DOCTEST_REQUIRE_NOTHROW_MESSAGE
-
-#ifdef DOCTEST_CONFIG_NO_EXCEPTIONS_BUT_WITH_ALL_ASSERTS
-
-#define DOCTEST_WARN_THROWS(expr) ((void)0)
-#define DOCTEST_CHECK_THROWS(expr) ((void)0)
-#define DOCTEST_REQUIRE_THROWS(expr) ((void)0)
-#ifdef DOCTEST_CONFIG_WITH_VARIADIC_MACROS
-#define DOCTEST_WARN_THROWS_AS(expr, ...) ((void)0)
-#define DOCTEST_CHECK_THROWS_AS(expr, ...) ((void)0)
-#define DOCTEST_REQUIRE_THROWS_AS(expr, ...) ((void)0)
-#else // DOCTEST_CONFIG_WITH_VARIADIC_MACROS
-#define DOCTEST_WARN_THROWS_AS(expr, ex) ((void)0)
-#define DOCTEST_CHECK_THROWS_AS(expr, ex) ((void)0)
-#define DOCTEST_REQUIRE_THROWS_AS(expr, ex) ((void)0)
-#endif // DOCTEST_CONFIG_WITH_VARIADIC_MACROS
-#define DOCTEST_WARN_NOTHROW(expr) ((void)0)
-#define DOCTEST_CHECK_NOTHROW(expr) ((void)0)
-#define DOCTEST_REQUIRE_NOTHROW(expr) ((void)0)
-
-#define DOCTEST_WARN_THROWS_MESSAGE(expr, msg) ((void)0)
-#define DOCTEST_CHECK_THROWS_MESSAGE(expr, msg) ((void)0)
-#define DOCTEST_REQUIRE_THROWS_MESSAGE(expr, msg) ((void)0)
-#define DOCTEST_WARN_THROWS_AS_MESSAGE(expr, ex, msg) ((void)0)
-#define DOCTEST_CHECK_THROWS_AS_MESSAGE(expr, ex, msg) ((void)0)
-#define DOCTEST_REQUIRE_THROWS_AS_MESSAGE(expr, ex, msg) ((void)0)
-#define DOCTEST_WARN_NOTHROW_MESSAGE(expr, msg) ((void)0)
-#define DOCTEST_CHECK_NOTHROW_MESSAGE(expr, msg) ((void)0)
-#define DOCTEST_REQUIRE_NOTHROW_MESSAGE(expr, msg) ((void)0)
-
-#else // DOCTEST_CONFIG_NO_EXCEPTIONS_BUT_WITH_ALL_ASSERTS
-
-#undef DOCTEST_REQUIRE
-#undef DOCTEST_REQUIRE_FALSE
-#undef DOCTEST_REQUIRE_MESSAGE
-#undef DOCTEST_REQUIRE_FALSE_MESSAGE
-#undef DOCTEST_REQUIRE_EQ
-#undef DOCTEST_REQUIRE_NE
-#undef DOCTEST_REQUIRE_GT
-#undef DOCTEST_REQUIRE_LT
-#undef DOCTEST_REQUIRE_GE
-#undef DOCTEST_REQUIRE_LE
-#undef DOCTEST_REQUIRE_UNARY
-#undef DOCTEST_REQUIRE_UNARY_FALSE
-#undef DOCTEST_FAST_REQUIRE_EQ
-#undef DOCTEST_FAST_REQUIRE_NE
-#undef DOCTEST_FAST_REQUIRE_GT
-#undef DOCTEST_FAST_REQUIRE_LT
-#undef DOCTEST_FAST_REQUIRE_GE
-#undef DOCTEST_FAST_REQUIRE_LE
-#undef DOCTEST_FAST_REQUIRE_UNARY
-#undef DOCTEST_FAST_REQUIRE_UNARY_FALSE
-
-#endif // DOCTEST_CONFIG_NO_EXCEPTIONS_BUT_WITH_ALL_ASSERTS
-
-#endif // DOCTEST_CONFIG_NO_EXCEPTIONS
-
-// =================================================================================================
-// == WHAT FOLLOWS IS VERSIONS OF THE MACROS THAT DO NOT DO ANY REGISTERING!                      ==
-// == THIS CAN BE ENABLED BY DEFINING DOCTEST_CONFIG_DISABLE GLOBALLY!                            ==
-// =================================================================================================
-#else // DOCTEST_CONFIG_DISABLE
-
-#define DOCTEST_IMPLEMENT_FIXTURE(der, base, func, name)                                           \
-    namespace                                                                                      \
-    {                                                                                              \
-        template <typename T>                                                                      \
-        struct der : base                                                                          \
-        { void f(); };                                                                             \
-    }                                                                                              \
-    template <typename T>                                                                          \
-    inline void der<T>::f()
-
-#define DOCTEST_CREATE_AND_REGISTER_FUNCTION(f, name)                                              \
-    template <typename T>                                                                          \
-    static inline void f()
-
-// for registering tests
-#define DOCTEST_TEST_CASE(name)                                                                    \
-    DOCTEST_CREATE_AND_REGISTER_FUNCTION(DOCTEST_ANONYMOUS(_DOCTEST_ANON_FUNC_), name)
-
-// for registering tests with a fixture
-#define DOCTEST_TEST_CASE_FIXTURE(x, name)                                                         \
-    DOCTEST_IMPLEMENT_FIXTURE(DOCTEST_ANONYMOUS(_DOCTEST_ANON_CLASS_), x,                          \
-                              DOCTEST_ANONYMOUS(_DOCTEST_ANON_FUNC_), name)
-
-// for converting types to strings without the <typeinfo> header and demangling
-#ifdef DOCTEST_CONFIG_WITH_VARIADIC_MACROS
-#define DOCTEST_TYPE_TO_STRING(...) typedef int DOCTEST_ANONYMOUS(_DOCTEST_ANON_FOR_SEMICOLON_)
-#define DOCTEST_TYPE_TO_STRING_IMPL(...)
-#else // DOCTEST_CONFIG_WITH_VARIADIC_MACROS
-#define DOCTEST_TYPE_TO_STRING(x) typedef int DOCTEST_ANONYMOUS(_DOCTEST_ANON_FOR_SEMICOLON_)
-#define DOCTEST_TYPE_TO_STRING_IMPL(x)
-#endif // DOCTEST_CONFIG_WITH_VARIADIC_MACROS
-
-// for typed tests
-#define DOCTEST_TEST_CASE_TEMPLATE(name, type, types)                                              \
-    template <typename type>                                                                       \
-    inline void DOCTEST_ANONYMOUS(_DOCTEST_ANON_TMP_)()
-
-#define DOCTEST_TEST_CASE_TEMPLATE_DEFINE(name, type, id)                                          \
-    template <typename type>                                                                       \
-    inline void DOCTEST_ANONYMOUS(_DOCTEST_ANON_TMP_)()
-
-#define DOCTEST_TEST_CASE_TEMPLATE_INSTANTIATE(id, types)                                          \
-    typedef int DOCTEST_ANONYMOUS(_DOCTEST_ANON_FOR_SEMICOLON_)
-
-// for subcases
-#define DOCTEST_SUBCASE(name)
-
-// for a testsuite block
-#define DOCTEST_TEST_SUITE(name) namespace
-
-// for starting a testsuite block
-#define DOCTEST_TEST_SUITE_BEGIN(name) typedef int DOCTEST_ANONYMOUS(_DOCTEST_ANON_FOR_SEMICOLON_)
-
-// for ending a testsuite block
-#define DOCTEST_TEST_SUITE_END typedef int DOCTEST_ANONYMOUS(_DOCTEST_ANON_FOR_SEMICOLON_)
-
-#define DOCTEST_REGISTER_EXCEPTION_TRANSLATOR(signature)                                           \
-    template <typename T>                                                                          \
-    static inline doctest::String DOCTEST_ANONYMOUS(_DOCTEST_ANON_TRANSLATOR_)(signature)
-
-#define DOCTEST_INFO(x) ((void)0)
-#define DOCTEST_CAPTURE(x) ((void)0)
-#define DOCTEST_ADD_MESSAGE_AT(file, line, x) ((void)0)
-#define DOCTEST_ADD_FAIL_CHECK_AT(file, line, x) ((void)0)
-#define DOCTEST_ADD_FAIL_AT(file, line, x) ((void)0)
-#define DOCTEST_MESSAGE(x) ((void)0)
-#define DOCTEST_FAIL_CHECK(x) ((void)0)
-#define DOCTEST_FAIL(x) ((void)0)
-
-#ifdef DOCTEST_CONFIG_WITH_VARIADIC_MACROS
-#define DOCTEST_WARN(...) ((void)0)
-#define DOCTEST_CHECK(...) ((void)0)
-#define DOCTEST_REQUIRE(...) ((void)0)
-#define DOCTEST_WARN_FALSE(...) ((void)0)
-#define DOCTEST_CHECK_FALSE(...) ((void)0)
-#define DOCTEST_REQUIRE_FALSE(...) ((void)0)
-#else // DOCTEST_CONFIG_WITH_VARIADIC_MACROS
-#define DOCTEST_WARN(expr) ((void)0)
-#define DOCTEST_CHECK(expr) ((void)0)
-#define DOCTEST_REQUIRE(expr) ((void)0)
-#define DOCTEST_WARN_FALSE(expr) ((void)0)
-#define DOCTEST_CHECK_FALSE(expr) ((void)0)
-#define DOCTEST_REQUIRE_FALSE(expr) ((void)0)
-#endif // DOCTEST_CONFIG_WITH_VARIADIC_MACROS
-
-#define DOCTEST_WARN_MESSAGE(cond, msg) ((void)0)
-#define DOCTEST_CHECK_MESSAGE(cond, msg) ((void)0)
-#define DOCTEST_REQUIRE_MESSAGE(cond, msg) ((void)0)
-#define DOCTEST_WARN_FALSE_MESSAGE(cond, msg) ((void)0)
-#define DOCTEST_CHECK_FALSE_MESSAGE(cond, msg) ((void)0)
-#define DOCTEST_REQUIRE_FALSE_MESSAGE(cond, msg) ((void)0)
-
-#define DOCTEST_WARN_THROWS(expr) ((void)0)
-#define DOCTEST_CHECK_THROWS(expr) ((void)0)
-#define DOCTEST_REQUIRE_THROWS(expr) ((void)0)
-#ifdef DOCTEST_CONFIG_WITH_VARIADIC_MACROS
-#define DOCTEST_WARN_THROWS_AS(expr, ...) ((void)0)
-#define DOCTEST_CHECK_THROWS_AS(expr, ...) ((void)0)
-#define DOCTEST_REQUIRE_THROWS_AS(expr, ...) ((void)0)
-#else // DOCTEST_CONFIG_WITH_VARIADIC_MACROS
-#define DOCTEST_WARN_THROWS_AS(expr, ex) ((void)0)
-#define DOCTEST_CHECK_THROWS_AS(expr, ex) ((void)0)
-#define DOCTEST_REQUIRE_THROWS_AS(expr, ex) ((void)0)
-#endif // DOCTEST_CONFIG_WITH_VARIADIC_MACROS
-#define DOCTEST_WARN_NOTHROW(expr) ((void)0)
-#define DOCTEST_CHECK_NOTHROW(expr) ((void)0)
-#define DOCTEST_REQUIRE_NOTHROW(expr) ((void)0)
-
-#define DOCTEST_WARN_THROWS_MESSAGE(expr, msg) ((void)0)
-#define DOCTEST_CHECK_THROWS_MESSAGE(expr, msg) ((void)0)
-#define DOCTEST_REQUIRE_THROWS_MESSAGE(expr, msg) ((void)0)
-#define DOCTEST_WARN_THROWS_AS_MESSAGE(expr, ex, msg) ((void)0)
-#define DOCTEST_CHECK_THROWS_AS_MESSAGE(expr, ex, msg) ((void)0)
-#define DOCTEST_REQUIRE_THROWS_AS_MESSAGE(expr, ex, msg) ((void)0)
-#define DOCTEST_WARN_NOTHROW_MESSAGE(expr, msg) ((void)0)
-#define DOCTEST_CHECK_NOTHROW_MESSAGE(expr, msg) ((void)0)
-#define DOCTEST_REQUIRE_NOTHROW_MESSAGE(expr, msg) ((void)0)
-
-#ifdef DOCTEST_CONFIG_WITH_VARIADIC_MACROS
-
-#define DOCTEST_WARN_EQ(...) ((void)0)
-#define DOCTEST_CHECK_EQ(...) ((void)0)
-#define DOCTEST_REQUIRE_EQ(...) ((void)0)
-#define DOCTEST_WARN_NE(...) ((void)0)
-#define DOCTEST_CHECK_NE(...) ((void)0)
-#define DOCTEST_REQUIRE_NE(...) ((void)0)
-#define DOCTEST_WARN_GT(...) ((void)0)
-#define DOCTEST_CHECK_GT(...) ((void)0)
-#define DOCTEST_REQUIRE_GT(...) ((void)0)
-#define DOCTEST_WARN_LT(...) ((void)0)
-#define DOCTEST_CHECK_LT(...) ((void)0)
-#define DOCTEST_REQUIRE_LT(...) ((void)0)
-#define DOCTEST_WARN_GE(...) ((void)0)
-#define DOCTEST_CHECK_GE(...) ((void)0)
-#define DOCTEST_REQUIRE_GE(...) ((void)0)
-#define DOCTEST_WARN_LE(...) ((void)0)
-#define DOCTEST_CHECK_LE(...) ((void)0)
-#define DOCTEST_REQUIRE_LE(...) ((void)0)
-
-#define DOCTEST_WARN_UNARY(...) ((void)0)
-#define DOCTEST_CHECK_UNARY(...) ((void)0)
-#define DOCTEST_REQUIRE_UNARY(...) ((void)0)
-#define DOCTEST_WARN_UNARY_FALSE(...) ((void)0)
-#define DOCTEST_CHECK_UNARY_FALSE(...) ((void)0)
-#define DOCTEST_REQUIRE_UNARY_FALSE(...) ((void)0)
-
-#define DOCTEST_FAST_WARN_EQ(...) ((void)0)
-#define DOCTEST_FAST_CHECK_EQ(...) ((void)0)
-#define DOCTEST_FAST_REQUIRE_EQ(...) ((void)0)
-#define DOCTEST_FAST_WARN_NE(...) ((void)0)
-#define DOCTEST_FAST_CHECK_NE(...) ((void)0)
-#define DOCTEST_FAST_REQUIRE_NE(...) ((void)0)
-#define DOCTEST_FAST_WARN_GT(...) ((void)0)
-#define DOCTEST_FAST_CHECK_GT(...) ((void)0)
-#define DOCTEST_FAST_REQUIRE_GT(...) ((void)0)
-#define DOCTEST_FAST_WARN_LT(...) ((void)0)
-#define DOCTEST_FAST_CHECK_LT(...) ((void)0)
-#define DOCTEST_FAST_REQUIRE_LT(...) ((void)0)
-#define DOCTEST_FAST_WARN_GE(...) ((void)0)
-#define DOCTEST_FAST_CHECK_GE(...) ((void)0)
-#define DOCTEST_FAST_REQUIRE_GE(...) ((void)0)
-#define DOCTEST_FAST_WARN_LE(...) ((void)0)
-#define DOCTEST_FAST_CHECK_LE(...) ((void)0)
-#define DOCTEST_FAST_REQUIRE_LE(...) ((void)0)
-
-#define DOCTEST_FAST_WARN_UNARY(...) ((void)0)
-#define DOCTEST_FAST_CHECK_UNARY(...) ((void)0)
-#define DOCTEST_FAST_REQUIRE_UNARY(...) ((void)0)
-#define DOCTEST_FAST_WARN_UNARY_FALSE(...) ((void)0)
-#define DOCTEST_FAST_CHECK_UNARY_FALSE(...) ((void)0)
-#define DOCTEST_FAST_REQUIRE_UNARY_FALSE(...) ((void)0)
-
-#else // DOCTEST_CONFIG_WITH_VARIADIC_MACROS
-
-#define DOCTEST_WARN_EQ(lhs, rhs) ((void)0)
-#define DOCTEST_CHECK_EQ(lhs, rhs) ((void)0)
-#define DOCTEST_REQUIRE_EQ(lhs, rhs) ((void)0)
-#define DOCTEST_WARN_NE(lhs, rhs) ((void)0)
-#define DOCTEST_CHECK_NE(lhs, rhs) ((void)0)
-#define DOCTEST_REQUIRE_NE(lhs, rhs) ((void)0)
-#define DOCTEST_WARN_GT(lhs, rhs) ((void)0)
-#define DOCTEST_CHECK_GT(lhs, rhs) ((void)0)
-#define DOCTEST_REQUIRE_GT(lhs, rhs) ((void)0)
-#define DOCTEST_WARN_LT(lhs, rhs) ((void)0)
-#define DOCTEST_CHECK_LT(lhs, rhs) ((void)0)
-#define DOCTEST_REQUIRE_LT(lhs, rhs) ((void)0)
-#define DOCTEST_WARN_GE(lhs, rhs) ((void)0)
-#define DOCTEST_CHECK_GE(lhs, rhs) ((void)0)
-#define DOCTEST_REQUIRE_GE(lhs, rhs) ((void)0)
-#define DOCTEST_WARN_LE(lhs, rhs) ((void)0)
-#define DOCTEST_CHECK_LE(lhs, rhs) ((void)0)
-#define DOCTEST_REQUIRE_LE(lhs, rhs) ((void)0)
-
-#define DOCTEST_WARN_UNARY(val) ((void)0)
-#define DOCTEST_CHECK_UNARY(val) ((void)0)
-#define DOCTEST_REQUIRE_UNARY(val) ((void)0)
-#define DOCTEST_WARN_UNARY_FALSE(val) ((void)0)
-#define DOCTEST_CHECK_UNARY_FALSE(val) ((void)0)
-#define DOCTEST_REQUIRE_UNARY_FALSE(val) ((void)0)
-
-#define DOCTEST_FAST_WARN_EQ(lhs, rhs) ((void)0)
-#define DOCTEST_FAST_CHECK_EQ(lhs, rhs) ((void)0)
-#define DOCTEST_FAST_REQUIRE_EQ(lhs, rhs) ((void)0)
-#define DOCTEST_FAST_WARN_NE(lhs, rhs) ((void)0)
-#define DOCTEST_FAST_CHECK_NE(lhs, rhs) ((void)0)
-#define DOCTEST_FAST_REQUIRE_NE(lhs, rhs) ((void)0)
-#define DOCTEST_FAST_WARN_GT(lhs, rhs) ((void)0)
-#define DOCTEST_FAST_CHECK_GT(lhs, rhs) ((void)0)
-#define DOCTEST_FAST_REQUIRE_GT(lhs, rhs) ((void)0)
-#define DOCTEST_FAST_WARN_LT(lhs, rhs) ((void)0)
-#define DOCTEST_FAST_CHECK_LT(lhs, rhs) ((void)0)
-#define DOCTEST_FAST_REQUIRE_LT(lhs, rhs) ((void)0)
-#define DOCTEST_FAST_WARN_GE(lhs, rhs) ((void)0)
-#define DOCTEST_FAST_CHECK_GE(lhs, rhs) ((void)0)
-#define DOCTEST_FAST_REQUIRE_GE(lhs, rhs) ((void)0)
-#define DOCTEST_FAST_WARN_LE(lhs, rhs) ((void)0)
-#define DOCTEST_FAST_CHECK_LE(lhs, rhs) ((void)0)
-#define DOCTEST_FAST_REQUIRE_LE(lhs, rhs) ((void)0)
-
-#define DOCTEST_FAST_WARN_UNARY(val) ((void)0)
-#define DOCTEST_FAST_CHECK_UNARY(val) ((void)0)
-#define DOCTEST_FAST_REQUIRE_UNARY(val) ((void)0)
-#define DOCTEST_FAST_WARN_UNARY_FALSE(val) ((void)0)
-#define DOCTEST_FAST_CHECK_UNARY_FALSE(val) ((void)0)
-#define DOCTEST_FAST_REQUIRE_UNARY_FALSE(val) ((void)0)
-
-#endif // DOCTEST_CONFIG_WITH_VARIADIC_MACROS
-
-#endif // DOCTEST_CONFIG_DISABLE
-
-// BDD style macros
-// clang-format off
-#define DOCTEST_SCENARIO(name)  TEST_CASE("  Scenario: " name)
-#define DOCTEST_GIVEN(name)     SUBCASE("   Given: " name)
-#define DOCTEST_WHEN(name)      SUBCASE("    When: " name)
-#define DOCTEST_AND_WHEN(name)  SUBCASE("And when: " name)
-#define DOCTEST_THEN(name)      SUBCASE("    Then: " name)
-#define DOCTEST_AND_THEN(name)  SUBCASE("     And: " name)
-// clang-format on
-
-// == SHORT VERSIONS OF THE MACROS
-#if !defined(DOCTEST_CONFIG_NO_SHORT_MACRO_NAMES)
-
-#define TEST_CASE DOCTEST_TEST_CASE
-#define TEST_CASE_FIXTURE DOCTEST_TEST_CASE_FIXTURE
-#define TYPE_TO_STRING DOCTEST_TYPE_TO_STRING
-#define TEST_CASE_TEMPLATE DOCTEST_TEST_CASE_TEMPLATE
-#define TEST_CASE_TEMPLATE_DEFINE DOCTEST_TEST_CASE_TEMPLATE_DEFINE
-#define TEST_CASE_TEMPLATE_INSTANTIATE DOCTEST_TEST_CASE_TEMPLATE_INSTANTIATE
-#define SUBCASE DOCTEST_SUBCASE
-#define TEST_SUITE DOCTEST_TEST_SUITE
-#define TEST_SUITE_BEGIN DOCTEST_TEST_SUITE_BEGIN
-#define TEST_SUITE_END DOCTEST_TEST_SUITE_END
-#define REGISTER_EXCEPTION_TRANSLATOR DOCTEST_REGISTER_EXCEPTION_TRANSLATOR
-#define INFO DOCTEST_INFO
-#define CAPTURE DOCTEST_CAPTURE
-#define ADD_MESSAGE_AT DOCTEST_ADD_MESSAGE_AT
-#define ADD_FAIL_CHECK_AT DOCTEST_ADD_FAIL_CHECK_AT
-#define ADD_FAIL_AT DOCTEST_ADD_FAIL_AT
-#define MESSAGE DOCTEST_MESSAGE
-#define FAIL_CHECK DOCTEST_FAIL_CHECK
-#define FAIL DOCTEST_FAIL
-#define TO_LVALUE DOCTEST_TO_LVALUE
-
-#define WARN DOCTEST_WARN
-#define WARN_FALSE DOCTEST_WARN_FALSE
-#define WARN_THROWS DOCTEST_WARN_THROWS
-#define WARN_THROWS_AS DOCTEST_WARN_THROWS_AS
-#define WARN_NOTHROW DOCTEST_WARN_NOTHROW
-#define CHECK DOCTEST_CHECK
-#define CHECK_FALSE DOCTEST_CHECK_FALSE
-#define CHECK_THROWS DOCTEST_CHECK_THROWS
-#define CHECK_THROWS_AS DOCTEST_CHECK_THROWS_AS
-#define CHECK_NOTHROW DOCTEST_CHECK_NOTHROW
-#define REQUIRE DOCTEST_REQUIRE
-#define REQUIRE_FALSE DOCTEST_REQUIRE_FALSE
-#define REQUIRE_THROWS DOCTEST_REQUIRE_THROWS
-#define REQUIRE_THROWS_AS DOCTEST_REQUIRE_THROWS_AS
-#define REQUIRE_NOTHROW DOCTEST_REQUIRE_NOTHROW
-
-#define WARN_MESSAGE DOCTEST_WARN_MESSAGE
-#define WARN_FALSE_MESSAGE DOCTEST_WARN_FALSE_MESSAGE
-#define WARN_THROWS_MESSAGE DOCTEST_WARN_THROWS_MESSAGE
-#define WARN_THROWS_AS_MESSAGE DOCTEST_WARN_THROWS_AS_MESSAGE
-#define WARN_NOTHROW_MESSAGE DOCTEST_WARN_NOTHROW_MESSAGE
-#define CHECK_MESSAGE DOCTEST_CHECK_MESSAGE
-#define CHECK_FALSE_MESSAGE DOCTEST_CHECK_FALSE_MESSAGE
-#define CHECK_THROWS_MESSAGE DOCTEST_CHECK_THROWS_MESSAGE
-#define CHECK_THROWS_AS_MESSAGE DOCTEST_CHECK_THROWS_AS_MESSAGE
-#define CHECK_NOTHROW_MESSAGE DOCTEST_CHECK_NOTHROW_MESSAGE
-#define REQUIRE_MESSAGE DOCTEST_REQUIRE_MESSAGE
-#define REQUIRE_FALSE_MESSAGE DOCTEST_REQUIRE_FALSE_MESSAGE
-#define REQUIRE_THROWS_MESSAGE DOCTEST_REQUIRE_THROWS_MESSAGE
-#define REQUIRE_THROWS_AS_MESSAGE DOCTEST_REQUIRE_THROWS_AS_MESSAGE
-#define REQUIRE_NOTHROW_MESSAGE DOCTEST_REQUIRE_NOTHROW_MESSAGE
-
-#define SCENARIO DOCTEST_SCENARIO
-#define GIVEN DOCTEST_GIVEN
-#define WHEN DOCTEST_WHEN
-#define AND_WHEN DOCTEST_AND_WHEN
-#define THEN DOCTEST_THEN
-#define AND_THEN DOCTEST_AND_THEN
-
-#define WARN_EQ DOCTEST_WARN_EQ
-#define CHECK_EQ DOCTEST_CHECK_EQ
-#define REQUIRE_EQ DOCTEST_REQUIRE_EQ
-#define WARN_NE DOCTEST_WARN_NE
-#define CHECK_NE DOCTEST_CHECK_NE
-#define REQUIRE_NE DOCTEST_REQUIRE_NE
-#define WARN_GT DOCTEST_WARN_GT
-#define CHECK_GT DOCTEST_CHECK_GT
-#define REQUIRE_GT DOCTEST_REQUIRE_GT
-#define WARN_LT DOCTEST_WARN_LT
-#define CHECK_LT DOCTEST_CHECK_LT
-#define REQUIRE_LT DOCTEST_REQUIRE_LT
-#define WARN_GE DOCTEST_WARN_GE
-#define CHECK_GE DOCTEST_CHECK_GE
-#define REQUIRE_GE DOCTEST_REQUIRE_GE
-#define WARN_LE DOCTEST_WARN_LE
-#define CHECK_LE DOCTEST_CHECK_LE
-#define REQUIRE_LE DOCTEST_REQUIRE_LE
-#define WARN_UNARY DOCTEST_WARN_UNARY
-#define CHECK_UNARY DOCTEST_CHECK_UNARY
-#define REQUIRE_UNARY DOCTEST_REQUIRE_UNARY
-#define WARN_UNARY_FALSE DOCTEST_WARN_UNARY_FALSE
-#define CHECK_UNARY_FALSE DOCTEST_CHECK_UNARY_FALSE
-#define REQUIRE_UNARY_FALSE DOCTEST_REQUIRE_UNARY_FALSE
-
-#define FAST_WARN_EQ DOCTEST_FAST_WARN_EQ
-#define FAST_CHECK_EQ DOCTEST_FAST_CHECK_EQ
-#define FAST_REQUIRE_EQ DOCTEST_FAST_REQUIRE_EQ
-#define FAST_WARN_NE DOCTEST_FAST_WARN_NE
-#define FAST_CHECK_NE DOCTEST_FAST_CHECK_NE
-#define FAST_REQUIRE_NE DOCTEST_FAST_REQUIRE_NE
-#define FAST_WARN_GT DOCTEST_FAST_WARN_GT
-#define FAST_CHECK_GT DOCTEST_FAST_CHECK_GT
-#define FAST_REQUIRE_GT DOCTEST_FAST_REQUIRE_GT
-#define FAST_WARN_LT DOCTEST_FAST_WARN_LT
-#define FAST_CHECK_LT DOCTEST_FAST_CHECK_LT
-#define FAST_REQUIRE_LT DOCTEST_FAST_REQUIRE_LT
-#define FAST_WARN_GE DOCTEST_FAST_WARN_GE
-#define FAST_CHECK_GE DOCTEST_FAST_CHECK_GE
-#define FAST_REQUIRE_GE DOCTEST_FAST_REQUIRE_GE
-#define FAST_WARN_LE DOCTEST_FAST_WARN_LE
-#define FAST_CHECK_LE DOCTEST_FAST_CHECK_LE
-#define FAST_REQUIRE_LE DOCTEST_FAST_REQUIRE_LE
-#define FAST_WARN_UNARY DOCTEST_FAST_WARN_UNARY
-#define FAST_CHECK_UNARY DOCTEST_FAST_CHECK_UNARY
-#define FAST_REQUIRE_UNARY DOCTEST_FAST_REQUIRE_UNARY
-#define FAST_WARN_UNARY_FALSE DOCTEST_FAST_WARN_UNARY_FALSE
-#define FAST_CHECK_UNARY_FALSE DOCTEST_FAST_CHECK_UNARY_FALSE
-#define FAST_REQUIRE_UNARY_FALSE DOCTEST_FAST_REQUIRE_UNARY_FALSE
-
-#endif // DOCTEST_CONFIG_NO_SHORT_MACRO_NAMES
-
-// this is here to clear the 'current test suite' for the current translation unit - at the top
-DOCTEST_TEST_SUITE_END();
-
-// add stringification for primitive/fundamental types
-namespace doctest
-{
-namespace detail
-{
-    DOCTEST_TYPE_TO_STRING_IMPL(bool)
-    DOCTEST_TYPE_TO_STRING_IMPL(float)
-    DOCTEST_TYPE_TO_STRING_IMPL(double)
-    DOCTEST_TYPE_TO_STRING_IMPL(long double)
-    DOCTEST_TYPE_TO_STRING_IMPL(char)
-    DOCTEST_TYPE_TO_STRING_IMPL(signed char)
-    DOCTEST_TYPE_TO_STRING_IMPL(unsigned char)
-    DOCTEST_TYPE_TO_STRING_IMPL(wchar_t)
-    DOCTEST_TYPE_TO_STRING_IMPL(short int)
-    DOCTEST_TYPE_TO_STRING_IMPL(unsigned short int)
-    DOCTEST_TYPE_TO_STRING_IMPL(int)
-    DOCTEST_TYPE_TO_STRING_IMPL(unsigned int)
-    DOCTEST_TYPE_TO_STRING_IMPL(long int)
-    DOCTEST_TYPE_TO_STRING_IMPL(unsigned long int)
-#ifdef DOCTEST_CONFIG_WITH_LONG_LONG
-    DOCTEST_TYPE_TO_STRING_IMPL(long long int)
-    DOCTEST_TYPE_TO_STRING_IMPL(unsigned long long int)
-#endif // DOCTEST_CONFIG_WITH_LONG_LONG
-} // namespace detail
-} // namespace doctest
-
-#endif // DOCTEST_LIBRARY_INCLUDED
-
-#if defined(__clang__)
-#pragma clang diagnostic pop
-#endif // __clang__
-
-#if defined(__GNUC__) && !defined(__clang__)
-#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 6)
-#pragma GCC diagnostic pop
-#endif // > gcc 4.6
-#endif // __GNUC__
-
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif // _MSC_VER
-
-#ifndef DOCTEST_SINGLE_HEADER
-#define DOCTEST_SINGLE_HEADER
-#endif // DOCTEST_SINGLE_HEADER
-
-#if defined(__clang__)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunknown-pragmas"
-#pragma clang diagnostic ignored "-Wpadded"
-#pragma clang diagnostic ignored "-Wglobal-constructors"
-#pragma clang diagnostic ignored "-Wexit-time-destructors"
-#pragma clang diagnostic ignored "-Wmissing-prototypes"
-#pragma clang diagnostic ignored "-Wsign-conversion"
-#pragma clang diagnostic ignored "-Wshorten-64-to-32"
-#pragma clang diagnostic ignored "-Wmissing-variable-declarations"
-#pragma clang diagnostic ignored "-Wswitch"
-#pragma clang diagnostic ignored "-Wswitch-enum"
-#pragma clang diagnostic ignored "-Wcovered-switch-default"
-#pragma clang diagnostic ignored "-Wmissing-noreturn"
-#pragma clang diagnostic ignored "-Wunused-local-typedef"
-#pragma clang diagnostic ignored "-Wdisabled-macro-expansion"
-#pragma clang diagnostic ignored "-Wmissing-braces"
-#pragma clang diagnostic ignored "-Wmissing-field-initializers"
-#pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant"
-#pragma clang diagnostic ignored "-Wc++11-long-long"
-#endif // __clang__
-
-#if defined(__GNUC__) && !defined(__clang__)
-#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 6)
-#pragma GCC diagnostic push
-#endif // > gcc 4.6
-#pragma GCC diagnostic ignored "-Wunknown-pragmas"
-#pragma GCC diagnostic ignored "-Wconversion"
-#pragma GCC diagnostic ignored "-Weffc++"
-#pragma GCC diagnostic ignored "-Wsign-conversion"
-#pragma GCC diagnostic ignored "-Wstrict-overflow"
-#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
-#pragma GCC diagnostic ignored "-Wmissing-braces"
-#pragma GCC diagnostic ignored "-Wmissing-declarations"
-#pragma GCC diagnostic ignored "-Winline"
-#pragma GCC diagnostic ignored "-Wswitch"
-#pragma GCC diagnostic ignored "-Wswitch-enum"
-#pragma GCC diagnostic ignored "-Wswitch-default"
-#pragma GCC diagnostic ignored "-Wunsafe-loop-optimizations"
-#pragma GCC diagnostic ignored "-Wlong-long"
-#pragma GCC diagnostic ignored "-Wold-style-cast"
-#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 6)
-#pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant"
-#endif // > gcc 4.6
-#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 7)
-#pragma GCC diagnostic ignored "-Wunused-local-typedefs"
-#endif // > gcc 4.7
-#if __GNUC__ > 5 || (__GNUC__ == 5 && __GNUC_MINOR__ > 3)
-#pragma GCC diagnostic ignored "-Wuseless-cast"
-#endif // > gcc 5.3
-#endif // __GNUC__
-
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable : 4996) // The compiler encountered a deprecated declaration
-#pragma warning(disable : 4267) // 'var' : conversion from 'size_t' to 'type', possible loss of data
-#pragma warning(disable : 4706) // assignment within conditional expression
-#pragma warning(disable : 4512) // 'class' : assignment operator could not be generated
-#pragma warning(disable : 4127) // conditional expression is constant
-#pragma warning(disable : 4530) // C++ exception handler used, but unwind semantics are not enabled
-#pragma warning(disable : 4577) // 'noexcept' used with no exception handling mode specified
-#endif                          // _MSC_VER
-
-#if defined(DOCTEST_CONFIG_IMPLEMENT) || !defined(DOCTEST_SINGLE_HEADER)
-#ifndef DOCTEST_LIBRARY_IMPLEMENTATION
-#define DOCTEST_LIBRARY_IMPLEMENTATION
-
-#ifndef DOCTEST_SINGLE_HEADER
-#include "doctest_fwd.h"
-#endif // DOCTEST_SINGLE_HEADER
-
-#if defined(__clang__) && defined(DOCTEST_NO_CPP11_COMPAT)
-#pragma clang diagnostic ignored "-Wc++98-compat"
-#pragma clang diagnostic ignored "-Wc++98-compat-pedantic"
-#endif // __clang__ && DOCTEST_NO_CPP11_COMPAT
-
-// snprintf() not in the C++98 standard
-#ifdef _MSC_VER
-#define DOCTEST_SNPRINTF _snprintf
-#else
-#define DOCTEST_SNPRINTF std::snprintf
-#endif
-
-#define DOCTEST_LOG_START()                                                                        \
-    do {                                                                                           \
-        if(!contextState->hasLoggedCurrentTestStart) {                                             \
-            logTestStart(*contextState->currentTest);                                              \
-            contextState->hasLoggedCurrentTestStart = true;                                        \
-        }                                                                                          \
-    } while(false)
-
-// required includes - will go only in one translation unit!
-#include <ctime>
-#include <cmath>
-// borland (Embarcadero) compiler requires math.h and not cmath - https://github.com/onqtam/doctest/pull/37
-#ifdef __BORLANDC__
-#include <math.h>
-#endif // __BORLANDC__
-#include <new>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
-#include <limits>
-#include <utility>
-#include <sstream>
-#include <iomanip>
-#include <vector>
-#include <set>
-#include <exception>
-#include <stdexcept>
-#include <csignal>
-#include <cfloat>
-#ifndef _MSC_VER
-#include <stdint.h>
-#endif // _MSC_VER
-
-namespace doctest
-{
-namespace detail
-{
-    // lowers ascii letters
-    char tolower(const char c) { return (c >= 'A' && c <= 'Z') ? static_cast<char>(c + 32) : c; }
-
-    template <typename T>
-    T my_max(const T& lhs, const T& rhs) {
-        return lhs > rhs ? lhs : rhs;
-    }
-
-    // case insensitive strcmp
-    int stricmp(char const* a, char const* b) {
-        for(;; a++, b++) {
-            const int d = tolower(*a) - tolower(*b);
-            if(d != 0 || !*a)
-                return d;
-        }
-    }
-
-    void my_memcpy(void* dest, const void* src, unsigned num) {
-        const char* csrc  = static_cast<const char*>(src);
-        char*       cdest = static_cast<char*>(dest);
-        for(unsigned i = 0; i < num; ++i)
-            cdest[i]   = csrc[i];
-    }
-
-    // not using std::strlen() because of valgrind errors when optimizations are turned on
-    // 'Invalid read of size 4' when the test suite len (with '\0') is not a multiple of 4
-    // for details see http://stackoverflow.com/questions/35671155
-    unsigned my_strlen(const char* in) {
-        const char* temp = in;
-        while(temp && *temp)
-            ++temp;
-        return unsigned(temp - in);
-    }
-
-    template <typename T>
-    String fpToString(T value, int precision) {
-        std::ostringstream oss;
-        oss << std::setprecision(precision) << std::fixed << value;
-        std::string d = oss.str();
-        size_t      i = d.find_last_not_of('0');
-        if(i != std::string::npos && i != d.size() - 1) {
-            if(d[i] == '.')
-                i++;
-            d = d.substr(0, i + 1);
-        }
-        return d.c_str();
-    }
-
-    struct Endianness
-    {
-        enum Arch
-        {
-            Big,
-            Little
-        };
-
-        static Arch which() {
-            union _
-            {
-                int  asInt;
-                char asChar[sizeof(int)];
-            } u;
-
-            u.asInt = 1;                                            // NOLINT
-            return (u.asChar[sizeof(int) - 1] == 1) ? Big : Little; // NOLINT
-        }
-    };
-
-    String rawMemoryToString(const void* object, unsigned size) {
-        // Reverse order for little endian architectures
-        int i = 0, end = static_cast<int>(size), inc = 1;
-        if(Endianness::which() == Endianness::Little) {
-            i   = end - 1;
-            end = inc = -1;
-        }
-
-        unsigned char const* bytes = static_cast<unsigned char const*>(object);
-        std::ostringstream   os;
-        os << "0x" << std::setfill('0') << std::hex;
-        for(; i != end; i += inc)
-            os << std::setw(2) << static_cast<unsigned>(bytes[i]);
-        return os.str().c_str();
-    }
-
-    std::ostream* createStream() { return new std::ostringstream(); }
-    String getStreamResult(std::ostream* in) {
-        return static_cast<std::ostringstream*>(in)->str().c_str(); // NOLINT
-    }
-    void freeStream(std::ostream* in) { delete in; }
-
-#ifndef DOCTEST_CONFIG_DISABLE
-
-    // this holds both parameters for the command line and runtime data for tests
-    struct ContextState : TestAccessibleContextState //!OCLINT too many fields
-    {
-        // == parameters from the command line
-
-        std::vector<std::vector<String> > filters;
-
-        String   order_by;  // how tests should be ordered
-        unsigned rand_seed; // the seed for rand ordering
-
-        unsigned first; // the first (matching) test to be executed
-        unsigned last;  // the last (matching) test to be executed
-
-        int  abort_after;           // stop tests after this many failed assertions
-        int  subcase_filter_levels; // apply the subcase filters for the first N levels
-        bool case_sensitive;        // if filtering should be case sensitive
-        bool exit;         // if the program should be exited after the tests are ran/whatever
-        bool duration;     // print the time duration of each test case
-        bool no_exitcode;  // if the framework should return 0 as the exitcode
-        bool no_run;       // to not run the tests at all (can be done with an "*" exclude)
-        bool no_version;   // to not print the version of the framework
-        bool no_colors;    // if output to the console should be colorized
-        bool force_colors; // forces the use of colors even when a tty cannot be detected
-        bool no_breaks;    // to not break into the debugger
-        bool no_skip;      // don't skip test cases which are marked to be skipped
-        bool no_path_in_filenames; // if the path to files should be removed from the output
-        bool no_line_numbers;      // if source code line numbers should be omitted from the output
-        bool no_skipped_summary;   // don't print "skipped" in the summary !!! UNDOCUMENTED !!!
-
-        bool help;             // to print the help
-        bool version;          // to print the version
-        bool count;            // if only the count of matching tests is to be retreived
-        bool list_test_cases;  // to list all tests matching the filters
-        bool list_test_suites; // to list all suites matching the filters
-
-        // == data for the tests being ran
-
-        unsigned        numTestsPassingFilters;
-        unsigned        numTestSuitesPassingFilters;
-        unsigned        numFailed;
-        const TestCase* currentTest;
-        bool            hasLoggedCurrentTestStart;
-        int             numAssertionsForCurrentTestcase;
-        int             numAssertions;
-        int             numFailedAssertionsForCurrentTestcase;
-        int             numFailedAssertions;
-        bool            hasCurrentTestFailed;
-
-        std::vector<IContextScope*> contexts;            // for logging with INFO() and friends
-        std::vector<std::string>    exceptionalContexts; // logging from INFO() due to an exception
-
-        // stuff for subcases
-        std::set<SubcaseSignature> subcasesPassed;
-        std::set<int>              subcasesEnteredLevels;
-        std::vector<Subcase>       subcasesStack;
-        int                        subcasesCurrentLevel;
-        bool                       subcasesHasSkipped;
-
-        void resetRunData() {
-            numTestsPassingFilters                = 0;
-            numTestSuitesPassingFilters           = 0;
-            numFailed                             = 0;
-            numAssertions                         = 0;
-            numFailedAssertions                   = 0;
-            numFailedAssertionsForCurrentTestcase = 0;
-        }
-
-        // cppcheck-suppress uninitMemberVar
-        ContextState()
-                : filters(8) // 8 different filters total
-        {
-            resetRunData();
-        }
-    };
-
-    ContextState* contextState = 0;
-#endif // DOCTEST_CONFIG_DISABLE
-} // namespace detail
-
-void String::copy(const String& other) {
-    if(other.isOnStack()) {
-        detail::my_memcpy(buf, other.buf, len);
-    } else {
-        setOnHeap();
-        data.size     = other.data.size;
-        data.capacity = data.size + 1;
-        data.ptr      = new char[data.capacity];
-        detail::my_memcpy(data.ptr, other.data.ptr, data.size + 1);
-    }
-}
-
-String::String(const char* in) {
-    unsigned in_len = detail::my_strlen(in);
-    if(in_len <= last) {
-        detail::my_memcpy(buf, in, in_len + 1);
-        setLast(last - in_len);
-    } else {
-        setOnHeap();
-        data.size     = in_len;
-        data.capacity = data.size + 1;
-        data.ptr      = new char[data.capacity];
-        detail::my_memcpy(data.ptr, in, in_len + 1);
-    }
-}
-
-String& String::operator+=(const String& other) {
-    const unsigned my_old_size = size();
-    const unsigned other_size  = other.size();
-    const unsigned total_size  = my_old_size + other_size;
-    if(isOnStack()) {
-        if(total_size < len) {
-            // append to the current stack space
-            detail::my_memcpy(buf + my_old_size, other.c_str(), other_size + 1);
-            setLast(last - total_size);
-        } else {
-            // alloc new chunk
-            char* temp = new char[total_size + 1];
-            // copy current data to new location before writing in the union
-            detail::my_memcpy(temp, buf, my_old_size); // skip the +1 ('\0') for speed
-            // update data in union
-            setOnHeap();
-            data.size     = total_size;
-            data.capacity = data.size + 1;
-            data.ptr      = temp;
-            // transfer the rest of the data
-            detail::my_memcpy(data.ptr + my_old_size, other.c_str(), other_size + 1);
-        }
-    } else {
-        if(data.capacity > total_size) {
-            // append to the current heap block
-            data.size = total_size;
-            detail::my_memcpy(data.ptr + my_old_size, other.c_str(), other_size + 1);
-        } else {
-            // resize
-            data.capacity *= 2;
-            if(data.capacity <= total_size)
-                data.capacity = total_size + 1;
-            // alloc new chunk
-            char* temp = new char[data.capacity];
-            // copy current data to new location before releasing it
-            detail::my_memcpy(temp, data.ptr, my_old_size); // skip the +1 ('\0') for speed
-            // release old chunk
-            delete[] data.ptr;
-            // update the rest of the union members
-            data.size = total_size;
-            data.ptr  = temp;
-            // transfer the rest of the data
-            detail::my_memcpy(data.ptr + my_old_size, other.c_str(), other_size + 1);
-        }
-    }
-
-    return *this;
-}
-
-#ifdef DOCTEST_CONFIG_WITH_RVALUE_REFERENCES
-String::String(String&& other) {
-    detail::my_memcpy(buf, other.buf, len);
-    other.buf[0] = '\0';
-    other.setLast();
-}
-
-String& String::operator=(String&& other) {
-    if(this != &other) {
-        if(!isOnStack())
-            delete[] data.ptr;
-        detail::my_memcpy(buf, other.buf, len);
-        other.buf[0] = '\0';
-        other.setLast();
-    }
-    return *this;
-}
-#endif // DOCTEST_CONFIG_WITH_RVALUE_REFERENCES
-
-int String::compare(const char* other, bool no_case) const {
-    if(no_case)
-        return detail::stricmp(c_str(), other);
-    return std::strcmp(c_str(), other);
-}
-
-int String::compare(const String& other, bool no_case) const {
-    return compare(other.c_str(), no_case);
-}
-
-std::ostream& operator<<(std::ostream& stream, const String& in) {
-    stream << in.c_str();
-    return stream;
-}
-
-Approx::Approx(double value)
-        : m_epsilon(static_cast<double>(std::numeric_limits<float>::epsilon()) * 100)
-        , m_scale(1.0)
-        , m_value(value) {}
-
-bool operator==(double lhs, Approx const& rhs) {
-    // Thanks to Richard Harris for his help refining this formula
-    return std::fabs(lhs - rhs.m_value) <
-           rhs.m_epsilon * (rhs.m_scale + detail::my_max(std::fabs(lhs), std::fabs(rhs.m_value)));
-}
-
-String Approx::toString() const { return String("Approx( ") + doctest::toString(m_value) + " )"; }
-
-#ifdef DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING
-String toString(char* in) { return toString(static_cast<const char*>(in)); }
-String toString(const char* in) { return String("\"") + (in ? in : "{null string}") + "\""; }
-#endif // DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING
-String toString(bool in) { return in ? "true" : "false"; }
-String toString(float in) { return detail::fpToString(in, 5) + "f"; }
-String toString(double in) { return detail::fpToString(in, 10); }
-String toString(double long in) { return detail::fpToString(in, 15); }
-
-String toString(char in) {
-    char buf[64];
-    std::sprintf(buf, "%d", in);
-    return buf;
-}
-
-String toString(char signed in) {
-    char buf[64];
-    std::sprintf(buf, "%d", in);
-    return buf;
-}
-
-String toString(char unsigned in) {
-    char buf[64];
-    std::sprintf(buf, "%ud", in);
-    return buf;
-}
-
-String toString(int short in) {
-    char buf[64];
-    std::sprintf(buf, "%d", in);
-    return buf;
-}
-
-String toString(int short unsigned in) {
-    char buf[64];
-    std::sprintf(buf, "%u", in);
-    return buf;
-}
-
-String toString(int in) {
-    char buf[64];
-    std::sprintf(buf, "%d", in);
-    return buf;
-}
-
-String toString(int unsigned in) {
-    char buf[64];
-    std::sprintf(buf, "%u", in);
-    return buf;
-}
-
-String toString(int long in) {
-    char buf[64];
-    std::sprintf(buf, "%ld", in);
-    return buf;
-}
-
-String toString(int long unsigned in) {
-    char buf[64];
-    std::sprintf(buf, "%lu", in);
-    return buf;
-}
-
-#ifdef DOCTEST_CONFIG_WITH_LONG_LONG
-String toString(int long long in) {
-    char buf[64];
-    std::sprintf(buf, "%lld", in);
-    return buf;
-}
-String toString(int long long unsigned in) {
-    char buf[64];
-    std::sprintf(buf, "%llu", in);
-    return buf;
-}
-#endif // DOCTEST_CONFIG_WITH_LONG_LONG
-
-#ifdef DOCTEST_CONFIG_WITH_NULLPTR
-String toString(std::nullptr_t) { return "nullptr"; }
-#endif // DOCTEST_CONFIG_WITH_NULLPTR
-
-} // namespace doctest
-
-#ifdef DOCTEST_CONFIG_DISABLE
-namespace doctest
-{
-bool isRunningInTest() { return false; }
-Context::Context(int, const char* const*) {}
-Context::~Context() {}
-void Context::applyCommandLine(int, const char* const*) {}
-void Context::addFilter(const char*, const char*) {}
-void Context::clearFilters() {}
-void Context::setOption(const char*, int) {}
-void Context::setOption(const char*, const char*) {}
-bool Context::shouldExit() { return false; }
-int  Context::run() { return 0; }
-} // namespace doctest
-#else // DOCTEST_CONFIG_DISABLE
-
-#if !defined(DOCTEST_CONFIG_COLORS_NONE)
-#if !defined(DOCTEST_CONFIG_COLORS_WINDOWS) && !defined(DOCTEST_CONFIG_COLORS_ANSI)
-#ifdef DOCTEST_PLATFORM_WINDOWS
-#define DOCTEST_CONFIG_COLORS_WINDOWS
-#else // linux
-#define DOCTEST_CONFIG_COLORS_ANSI
-#endif // platform
-#endif // DOCTEST_CONFIG_COLORS_WINDOWS && DOCTEST_CONFIG_COLORS_ANSI
-#endif // DOCTEST_CONFIG_COLORS_NONE
-
-#define DOCTEST_PRINTF_COLORED(buffer, color)                                                      \
-    do {                                                                                           \
-        Color col(color);                                                                          \
-        std::printf("%s", buffer);                                                                 \
-    } while((void)0, 0)
-
-// the buffer size used for snprintf() calls
-#if !defined(DOCTEST_SNPRINTF_BUFFER_LENGTH)
-#define DOCTEST_SNPRINTF_BUFFER_LENGTH 1024
-#endif // DOCTEST_SNPRINTF_BUFFER_LENGTH
-
-#if defined(_MSC_VER) || defined(__MINGW32__)
-#if defined(_MSC_VER) && _MSC_VER >= 1700
-#define DOCTEST_WINDOWS_SAL_IN_OPT _In_opt_
-#else // _MSC_VER
-#define DOCTEST_WINDOWS_SAL_IN_OPT
-#endif // _MSC_VER
-extern "C" __declspec(dllimport) void __stdcall OutputDebugStringA(
-        DOCTEST_WINDOWS_SAL_IN_OPT const char*);
-extern "C" __declspec(dllimport) int __stdcall IsDebuggerPresent();
-#endif // _MSC_VER || __MINGW32__
-
-#ifdef DOCTEST_CONFIG_COLORS_ANSI
-#include <unistd.h>
-#endif // DOCTEST_CONFIG_COLORS_ANSI
-
-#ifdef _WIN32
-
-// defines for a leaner windows.h
-#ifndef WIN32_MEAN_AND_LEAN
-#define WIN32_MEAN_AND_LEAN
-#endif // WIN32_MEAN_AND_LEAN
-#ifndef VC_EXTRA_LEAN
-#define VC_EXTRA_LEAN
-#endif // VC_EXTRA_LEAN
-#ifndef NOMINMAX
-#define NOMINMAX
-#endif // NOMINMAX
-
-// not sure what AfxWin.h is for - here I do what Catch does
-#ifdef __AFXDLL
-#include <AfxWin.h>
-#else
-#include <windows.h>
-#endif
-#include <io.h>
-
-#else // _WIN32
-
-#include <sys/time.h>
-
-#endif // _WIN32
-
-namespace doctest_detail_test_suite_ns
-{
-// holds the current test suite
-doctest::detail::TestSuite& getCurrentTestSuite() {
-    static doctest::detail::TestSuite data;
-    return data;
-}
-} // namespace doctest_detail_test_suite_ns
-
-namespace doctest
-{
-namespace detail
-{
-    TestCase::TestCase(funcType test, const char* file, unsigned line, const TestSuite& test_suite,
-                       const char* type, int template_id)
-            : m_test(test)
-            , m_name(0)
-            , m_type(type)
-            , m_test_suite(test_suite.m_test_suite)
-            , m_description(test_suite.m_description)
-            , m_skip(test_suite.m_skip)
-            , m_may_fail(test_suite.m_may_fail)
-            , m_should_fail(test_suite.m_should_fail)
-            , m_expected_failures(test_suite.m_expected_failures)
-            , m_timeout(test_suite.m_timeout)
-            , m_file(file)
-            , m_line(line)
-            , m_template_id(template_id) {}
-
-    TestCase& TestCase::operator*(const char* in) {
-        m_name = in;
-        // make a new name with an appended type for templated test case
-        if(m_template_id != -1) {
-            m_full_name = String(m_name) + m_type;
-            // redirect the name to point to the newly constructed full name
-            m_name = m_full_name.c_str();
-        }
-        return *this;
-    }
-
-    TestCase& TestCase::operator=(const TestCase& other) {
-        m_test              = other.m_test;
-        m_full_name         = other.m_full_name;
-        m_name              = other.m_name;
-        m_type              = other.m_type;
-        m_test_suite        = other.m_test_suite;
-        m_description       = other.m_description;
-        m_skip              = other.m_skip;
-        m_may_fail          = other.m_may_fail;
-        m_should_fail       = other.m_should_fail;
-        m_expected_failures = other.m_expected_failures;
-        m_timeout           = other.m_timeout;
-        m_file              = other.m_file;
-        m_line              = other.m_line;
-        m_template_id       = other.m_template_id;
-
-        if(m_template_id != -1)
-            m_name = m_full_name.c_str();
-        return *this;
-    }
-
-    bool TestCase::operator<(const TestCase& other) const {
-        if(m_line != other.m_line)
-            return m_line < other.m_line;
-        const int file_cmp = std::strcmp(m_file, other.m_file);
-        if(file_cmp != 0)
-            return file_cmp < 0;
-        return m_template_id < other.m_template_id;
-    }
-
-    const char* getAssertString(assertType::Enum val) {
-        switch(val) { //!OCLINT missing default in switch statements
-            // clang-format off
-            case assertType::DT_WARN                    : return "WARN";
-            case assertType::DT_CHECK                   : return "CHECK";
-            case assertType::DT_REQUIRE                 : return "REQUIRE";
-
-            case assertType::DT_WARN_FALSE              : return "WARN_FALSE";
-            case assertType::DT_CHECK_FALSE             : return "CHECK_FALSE";
-            case assertType::DT_REQUIRE_FALSE           : return "REQUIRE_FALSE";
-
-            case assertType::DT_WARN_THROWS             : return "WARN_THROWS";
-            case assertType::DT_CHECK_THROWS            : return "CHECK_THROWS";
-            case assertType::DT_REQUIRE_THROWS          : return "REQUIRE_THROWS";
-
-            case assertType::DT_WARN_THROWS_AS          : return "WARN_THROWS_AS";
-            case assertType::DT_CHECK_THROWS_AS         : return "CHECK_THROWS_AS";
-            case assertType::DT_REQUIRE_THROWS_AS       : return "REQUIRE_THROWS_AS";
-
-            case assertType::DT_WARN_NOTHROW            : return "WARN_NOTHROW";
-            case assertType::DT_CHECK_NOTHROW           : return "CHECK_NOTHROW";
-            case assertType::DT_REQUIRE_NOTHROW         : return "REQUIRE_NOTHROW";
-
-            case assertType::DT_WARN_EQ                 : return "WARN_EQ";
-            case assertType::DT_CHECK_EQ                : return "CHECK_EQ";
-            case assertType::DT_REQUIRE_EQ              : return "REQUIRE_EQ";
-            case assertType::DT_WARN_NE                 : return "WARN_NE";
-            case assertType::DT_CHECK_NE                : return "CHECK_NE";
-            case assertType::DT_REQUIRE_NE              : return "REQUIRE_NE";
-            case assertType::DT_WARN_GT                 : return "WARN_GT";
-            case assertType::DT_CHECK_GT                : return "CHECK_GT";
-            case assertType::DT_REQUIRE_GT              : return "REQUIRE_GT";
-            case assertType::DT_WARN_LT                 : return "WARN_LT";
-            case assertType::DT_CHECK_LT                : return "CHECK_LT";
-            case assertType::DT_REQUIRE_LT              : return "REQUIRE_LT";
-            case assertType::DT_WARN_GE                 : return "WARN_GE";
-            case assertType::DT_CHECK_GE                : return "CHECK_GE";
-            case assertType::DT_REQUIRE_GE              : return "REQUIRE_GE";
-            case assertType::DT_WARN_LE                 : return "WARN_LE";
-            case assertType::DT_CHECK_LE                : return "CHECK_LE";
-            case assertType::DT_REQUIRE_LE              : return "REQUIRE_LE";
-
-            case assertType::DT_WARN_UNARY              : return "WARN_UNARY";
-            case assertType::DT_CHECK_UNARY             : return "CHECK_UNARY";
-            case assertType::DT_REQUIRE_UNARY           : return "REQUIRE_UNARY";
-            case assertType::DT_WARN_UNARY_FALSE        : return "WARN_UNARY_FALSE";
-            case assertType::DT_CHECK_UNARY_FALSE       : return "CHECK_UNARY_FALSE";
-            case assertType::DT_REQUIRE_UNARY_FALSE     : return "REQUIRE_UNARY_FALSE";
-
-            case assertType::DT_FAST_WARN_EQ            : return "FAST_WARN_EQ";
-            case assertType::DT_FAST_CHECK_EQ           : return "FAST_CHECK_EQ";
-            case assertType::DT_FAST_REQUIRE_EQ         : return "FAST_REQUIRE_EQ";
-            case assertType::DT_FAST_WARN_NE            : return "FAST_WARN_NE";
-            case assertType::DT_FAST_CHECK_NE           : return "FAST_CHECK_NE";
-            case assertType::DT_FAST_REQUIRE_NE         : return "FAST_REQUIRE_NE";
-            case assertType::DT_FAST_WARN_GT            : return "FAST_WARN_GT";
-            case assertType::DT_FAST_CHECK_GT           : return "FAST_CHECK_GT";
-            case assertType::DT_FAST_REQUIRE_GT         : return "FAST_REQUIRE_GT";
-            case assertType::DT_FAST_WARN_LT            : return "FAST_WARN_LT";
-            case assertType::DT_FAST_CHECK_LT           : return "FAST_CHECK_LT";
-            case assertType::DT_FAST_REQUIRE_LT         : return "FAST_REQUIRE_LT";
-            case assertType::DT_FAST_WARN_GE            : return "FAST_WARN_GE";
-            case assertType::DT_FAST_CHECK_GE           : return "FAST_CHECK_GE";
-            case assertType::DT_FAST_REQUIRE_GE         : return "FAST_REQUIRE_GE";
-            case assertType::DT_FAST_WARN_LE            : return "FAST_WARN_LE";
-            case assertType::DT_FAST_CHECK_LE           : return "FAST_CHECK_LE";
-            case assertType::DT_FAST_REQUIRE_LE         : return "FAST_REQUIRE_LE";
-
-            case assertType::DT_FAST_WARN_UNARY         : return "FAST_WARN_UNARY";
-            case assertType::DT_FAST_CHECK_UNARY        : return "FAST_CHECK_UNARY";
-            case assertType::DT_FAST_REQUIRE_UNARY      : return "FAST_REQUIRE_UNARY";
-            case assertType::DT_FAST_WARN_UNARY_FALSE   : return "FAST_WARN_UNARY_FALSE";
-            case assertType::DT_FAST_CHECK_UNARY_FALSE  : return "FAST_CHECK_UNARY_FALSE";
-            case assertType::DT_FAST_REQUIRE_UNARY_FALSE: return "FAST_REQUIRE_UNARY_FALSE";
-                // clang-format on
-        }
-        return "";
-    }
-
-    bool checkIfShouldThrow(assertType::Enum assert_type) {
-        if(assert_type & assertType::is_require) //!OCLINT bitwise operator in conditional
-            return true;
-
-        if((assert_type & assertType::is_check) //!OCLINT bitwise operator in conditional
-           && contextState->abort_after > 0 &&
-           contextState->numFailedAssertions >= contextState->abort_after)
-            return true;
-
-        return false;
-    }
-    void fastAssertThrowIfFlagSet(int flags) {
-        if(flags & assertAction::shouldthrow) //!OCLINT bitwise operator in conditional
-            throwException();
-    }
-    void throwException() {
-#ifndef DOCTEST_CONFIG_NO_EXCEPTIONS
-        throw TestFailureException();
-#endif // DOCTEST_CONFIG_NO_EXCEPTIONS
-    }
-
-    // matching of a string against a wildcard mask (case sensitivity configurable) taken from
-    // http://www.emoticode.net/c/simple-wildcard-string-compare-globbing-function.html
-    int wildcmp(const char* str, const char* wild, bool caseSensitive) {
-        const char* cp = 0;
-        const char* mp = 0;
-
-        // rolled my own tolower() to not include more headers
-        while((*str) && (*wild != '*')) {
-            if((caseSensitive ? (*wild != *str) : (tolower(*wild) != tolower(*str))) &&
-               (*wild != '?')) {
-                return 0;
-            }
-            wild++;
-            str++;
-        }
-
-        while(*str) {
-            if(*wild == '*') {
-                if(!*++wild) {
-                    return 1;
-                }
-                mp = wild;
-                cp = str + 1;
-            } else if((caseSensitive ? (*wild == *str) : (tolower(*wild) == tolower(*str))) ||
-                      (*wild == '?')) {
-                wild++;
-                str++;
-            } else {
-                wild = mp;   //!OCLINT parameter reassignment
-                str  = cp++; //!OCLINT parameter reassignment
-            }
-        }
-
-        while(*wild == '*') {
-            wild++;
-        }
-        return !*wild;
-    }
-
-    //// C string hash function (djb2) - taken from http://www.cse.yorku.ca/~oz/hash.html
-    //unsigned hashStr(unsigned const char* str) {
-    //    unsigned long hash = 5381;
-    //    char          c;
-    //    while((c = *str++))
-    //        hash = ((hash << 5) + hash) + c; // hash * 33 + c
-    //    return hash;
-    //}
-
-    // checks if the name matches any of the filters (and can be configured what to do when empty)
-    bool matchesAny(const char* name, const std::vector<String>& filters, int matchEmpty,
-                    bool caseSensitive) {
-        if(filters.empty() && matchEmpty)
-            return true;
-        for(unsigned i = 0; i < filters.size(); ++i)
-            if(wildcmp(name, filters[i].c_str(), caseSensitive))
-                return true;
-        return false;
-    }
-
-#ifdef _WIN32
-
-    typedef unsigned long long UInt64;
-
-    UInt64 getCurrentTicks() {
-        static UInt64 hz = 0, hzo = 0;
-        if(!hz) {
-            QueryPerformanceFrequency(reinterpret_cast<LARGE_INTEGER*>(&hz));
-            QueryPerformanceCounter(reinterpret_cast<LARGE_INTEGER*>(&hzo));
-        }
-        UInt64 t;
-        QueryPerformanceCounter(reinterpret_cast<LARGE_INTEGER*>(&t));
-        return ((t - hzo) * 1000000) / hz;
-    }
-#else  // _WIN32
-
-    typedef uint64_t UInt64;
-
-    UInt64 getCurrentTicks() {
-        timeval t;
-        gettimeofday(&t, 0);
-        return static_cast<UInt64>(t.tv_sec) * 1000000 + static_cast<UInt64>(t.tv_usec);
-    }
-#endif // _WIN32
-
-    class Timer
-    {
-    public:
-        Timer()
-                : m_ticks(0) {}
-        void         start() { m_ticks = getCurrentTicks(); }
-        unsigned int getElapsedMicroseconds() const {
-            return static_cast<unsigned int>(getCurrentTicks() - m_ticks);
-        }
-        unsigned int getElapsedMilliseconds() const {
-            return static_cast<unsigned int>(getElapsedMicroseconds() / 1000);
-        }
-        double getElapsedSeconds() const { return getElapsedMicroseconds() / 1000000.0; }
-
-    private:
-        UInt64 m_ticks;
-    };
-
-    TestAccessibleContextState* getTestsContextState() { return contextState; }
-
-    bool SubcaseSignature::operator<(const SubcaseSignature& other) const {
-        if(m_line != other.m_line)
-            return m_line < other.m_line;
-        if(std::strcmp(m_file, other.m_file) != 0)
-            return std::strcmp(m_file, other.m_file) < 0;
-        return std::strcmp(m_name, other.m_name) < 0;
-    }
-
-    Subcase::Subcase(const char* name, const char* file, int line)
-            : m_signature(name, file, line)
-            , m_entered(false) {
-        ContextState* s = contextState;
-
-        // if we have already completed it
-        if(s->subcasesPassed.count(m_signature) != 0)
-            return;
-
-        // check subcase filters
-        if(s->subcasesCurrentLevel < s->subcase_filter_levels) {
-            if(!matchesAny(m_signature.m_name, s->filters[6], 1, s->case_sensitive))
-                return;
-            if(matchesAny(m_signature.m_name, s->filters[7], 0, s->case_sensitive))
-                return;
-        }
-
-        // if a Subcase on the same level has already been entered
-        if(s->subcasesEnteredLevels.count(s->subcasesCurrentLevel) != 0) {
-            s->subcasesHasSkipped = true;
-            return;
-        }
-
-        s->subcasesStack.push_back(*this);
-        if(s->hasLoggedCurrentTestStart)
-            logTestEnd();
-        s->hasLoggedCurrentTestStart = false;
-
-        s->subcasesEnteredLevels.insert(s->subcasesCurrentLevel++);
-        m_entered = true;
-    }
-
-    Subcase::Subcase(const Subcase& other)
-            : m_signature(other.m_signature.m_name, other.m_signature.m_file,
-                          other.m_signature.m_line)
-            , m_entered(other.m_entered) {}
-
-    Subcase::~Subcase() {
-        if(m_entered) {
-            ContextState* s = contextState;
-
-            s->subcasesCurrentLevel--;
-            // only mark the subcase as passed if no subcases have been skipped
-            if(s->subcasesHasSkipped == false)
-                s->subcasesPassed.insert(m_signature);
-
-            if(!s->subcasesStack.empty())
-                s->subcasesStack.pop_back();
-            if(s->hasLoggedCurrentTestStart)
-                logTestEnd();
-            s->hasLoggedCurrentTestStart = false;
-        }
-    }
-
-    Result::~Result() {}
-
-    Result& Result::operator=(const Result& other) {
-        m_passed        = other.m_passed;
-        m_decomposition = other.m_decomposition;
-
-        return *this;
-    }
-
-    // for sorting tests by file/line
-    int fileOrderComparator(const void* a, const void* b) {
-        const TestCase* lhs = *static_cast<TestCase* const*>(a);
-        const TestCase* rhs = *static_cast<TestCase* const*>(b);
-#ifdef _MSC_VER
-        // this is needed because MSVC gives different case for drive letters
-        // for __FILE__ when evaluated in a header and a source file
-        const int res = stricmp(lhs->m_file, rhs->m_file);
-#else  // _MSC_VER
-        const int res = std::strcmp(lhs->m_file, rhs->m_file);
-#endif // _MSC_VER
-        if(res != 0)
-            return res;
-        return static_cast<int>(lhs->m_line - rhs->m_line);
-    }
-
-    // for sorting tests by suite/file/line
-    int suiteOrderComparator(const void* a, const void* b) {
-        const TestCase* lhs = *static_cast<TestCase* const*>(a);
-        const TestCase* rhs = *static_cast<TestCase* const*>(b);
-
-        const int res = std::strcmp(lhs->m_test_suite, rhs->m_test_suite);
-        if(res != 0)
-            return res;
-        return fileOrderComparator(a, b);
-    }
-
-    // for sorting tests by name/suite/file/line
-    int nameOrderComparator(const void* a, const void* b) {
-        const TestCase* lhs = *static_cast<TestCase* const*>(a);
-        const TestCase* rhs = *static_cast<TestCase* const*>(b);
-
-        const int res_name = std::strcmp(lhs->m_name, rhs->m_name);
-        if(res_name != 0)
-            return res_name;
-        return suiteOrderComparator(a, b);
-    }
-
-    // sets the current test suite
-    int setTestSuite(const TestSuite& ts) {
-        doctest_detail_test_suite_ns::getCurrentTestSuite() = ts;
-        return 0;
-    }
-
-    // all the registered tests
-    std::set<TestCase>& getRegisteredTests() {
-        static std::set<TestCase> data;
-        return data;
-    }
-
-    // used by the macros for registering tests
-    int regTest(const TestCase& tc) {
-        getRegisteredTests().insert(tc);
-        return 0;
-    }
-
-    struct Color
-    {
-        enum Code
-        {
-            None = 0,
-            White,
-            Red,
-            Green,
-            Blue,
-            Cyan,
-            Yellow,
-            Grey,
-
-            Bright = 0x10,
-
-            BrightRed   = Bright | Red,
-            BrightGreen = Bright | Green,
-            LightGrey   = Bright | Grey,
-            BrightWhite = Bright | White
-        };
-        explicit Color(Code code) { use(code); }
-        ~Color() { use(None); }
-
-        static void use(Code code);
-        static void init();
-    };
-
-#ifdef DOCTEST_CONFIG_COLORS_WINDOWS
-    HANDLE g_stdoutHandle;
-    WORD   g_originalForegroundAttributes;
-    WORD   g_originalBackgroundAttributes;
-    bool   g_attrsInitted = false;
-#endif // DOCTEST_CONFIG_COLORS_WINDOWS
-
-    void Color::init() {
-#ifdef DOCTEST_CONFIG_COLORS_WINDOWS
-        if(!g_attrsInitted) {
-            g_stdoutHandle = GetStdHandle(STD_OUTPUT_HANDLE);
-            g_attrsInitted = true;
-            CONSOLE_SCREEN_BUFFER_INFO csbiInfo;
-            GetConsoleScreenBufferInfo(g_stdoutHandle, &csbiInfo);
-            g_originalForegroundAttributes =
-                    csbiInfo.wAttributes &
-                    ~(BACKGROUND_GREEN | BACKGROUND_RED | BACKGROUND_BLUE | BACKGROUND_INTENSITY);
-            g_originalBackgroundAttributes =
-                    csbiInfo.wAttributes &
-                    ~(FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE | FOREGROUND_INTENSITY);
-        }
-#endif // DOCTEST_CONFIG_COLORS_WINDOWS
-    }
-
-    void Color::use(Code
-#ifndef DOCTEST_CONFIG_COLORS_NONE
-                            code
-#endif // DOCTEST_CONFIG_COLORS_NONE
-                    ) {
-        const ContextState* p = contextState;
-        if(p->no_colors)
-            return;
-#ifdef DOCTEST_CONFIG_COLORS_ANSI
-        if(isatty(STDOUT_FILENO) == false && p->force_colors == false)
-            return;
-
-        const char* col = "";
-        // clang-format off
-        switch(code) { //!OCLINT missing break in switch statement / unnecessary default statement in covered switch statement
-            case Color::Red:         col = "[0;31m"; break;
-            case Color::Green:       col = "[0;32m"; break;
-            case Color::Blue:        col = "[0;34m"; break;
-            case Color::Cyan:        col = "[0;36m"; break;
-            case Color::Yellow:      col = "[0;33m"; break;
-            case Color::Grey:        col = "[1;30m"; break;
-            case Color::LightGrey:   col = "[0;37m"; break;
-            case Color::BrightRed:   col = "[1;31m"; break;
-            case Color::BrightGreen: col = "[1;32m"; break;
-            case Color::BrightWhite: col = "[1;37m"; break;
-            case Color::Bright: // invalid
-            case Color::None:
-            case Color::White:
-            default:                 col = "[0m";
-        }
-        // clang-format on
-        std::printf("\033%s", col);
-#endif // DOCTEST_CONFIG_COLORS_ANSI
-
-#ifdef DOCTEST_CONFIG_COLORS_WINDOWS
-        if(isatty(fileno(stdout)) == false && p->force_colors == false)
-            return;
-
-#define DOCTEST_SET_ATTR(x)                                                                        \
-    SetConsoleTextAttribute(g_stdoutHandle, x | g_originalBackgroundAttributes)
-
-        // clang-format off
-        switch (code) {
-            case Color::White:       DOCTEST_SET_ATTR(FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE); break;
-            case Color::Red:         DOCTEST_SET_ATTR(FOREGROUND_RED);                                      break;
-            case Color::Green:       DOCTEST_SET_ATTR(FOREGROUND_GREEN);                                    break;
-            case Color::Blue:        DOCTEST_SET_ATTR(FOREGROUND_BLUE);                                     break;
-            case Color::Cyan:        DOCTEST_SET_ATTR(FOREGROUND_BLUE | FOREGROUND_GREEN);                  break;
-            case Color::Yellow:      DOCTEST_SET_ATTR(FOREGROUND_RED | FOREGROUND_GREEN);                   break;
-            case Color::Grey:        DOCTEST_SET_ATTR(0);                                                   break;
-            case Color::LightGrey:   DOCTEST_SET_ATTR(FOREGROUND_INTENSITY);                                break;
-            case Color::BrightRed:   DOCTEST_SET_ATTR(FOREGROUND_INTENSITY | FOREGROUND_RED);               break;
-            case Color::BrightGreen: DOCTEST_SET_ATTR(FOREGROUND_INTENSITY | FOREGROUND_GREEN);             break;
-            case Color::BrightWhite: DOCTEST_SET_ATTR(FOREGROUND_INTENSITY | FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE); break;
-            case Color::None:
-            case Color::Bright: // invalid
-            default:                 DOCTEST_SET_ATTR(g_originalForegroundAttributes);
-        }
-// clang-format on
-#undef DOCTEST_SET_ATTR
-#endif // DOCTEST_CONFIG_COLORS_WINDOWS
-    }
-
-    std::vector<const IExceptionTranslator*>& getExceptionTranslators() {
-        static std::vector<const IExceptionTranslator*> data;
-        return data;
-    }
-
-    void registerExceptionTranslatorImpl(const IExceptionTranslator* translateFunction) {
-        getExceptionTranslators().push_back(translateFunction);
-    }
-
-    String translateActiveException() {
-#ifndef DOCTEST_CONFIG_NO_EXCEPTIONS
-        String                                    res;
-        std::vector<const IExceptionTranslator*>& translators = getExceptionTranslators();
-        for(size_t i = 0; i < translators.size(); ++i)
-            if(translators[i]->translate(res))
-                return res;
-        // clang-format off
-        try {
-            throw;
-        } catch(std::exception& ex) {
-            return ex.what();
-        } catch(std::string& msg) {
-            return msg.c_str();
-        } catch(const char* msg) {
-            return msg;
-        } catch(...) {
-            return "unknown exception";
-        }
-// clang-format on
-#else  // DOCTEST_CONFIG_NO_EXCEPTIONS
-        return "";
-#endif // DOCTEST_CONFIG_NO_EXCEPTIONS
-    }
-
-    void writeStringToStream(std::ostream* stream, const String& str) { *stream << str; }
-
-#ifdef DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING
-    void toStream(std::ostream* stream, char* in) { *stream << in; }
-    void toStream(std::ostream* stream, const char* in) { *stream << in; }
-#endif // DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING
-    void toStream(std::ostream* stream, bool in) {
-        *stream << std::boolalpha << in << std::noboolalpha;
-    }
-    void toStream(std::ostream* stream, float in) { *stream << in; }
-    void toStream(std::ostream* stream, double in) { *stream << in; }
-    void toStream(std::ostream* stream, double long in) { *stream << in; }
-
-    void toStream(std::ostream* stream, char in) { *stream << in; }
-    void toStream(std::ostream* stream, char signed in) { *stream << in; }
-    void toStream(std::ostream* stream, char unsigned in) { *stream << in; }
-    void toStream(std::ostream* stream, int short in) { *stream << in; }
-    void toStream(std::ostream* stream, int short unsigned in) { *stream << in; }
-    void toStream(std::ostream* stream, int in) { *stream << in; }
-    void toStream(std::ostream* stream, int unsigned in) { *stream << in; }
-    void toStream(std::ostream* stream, int long in) { *stream << in; }
-    void toStream(std::ostream* stream, int long unsigned in) { *stream << in; }
-
-#ifdef DOCTEST_CONFIG_WITH_LONG_LONG
-    void toStream(std::ostream* stream, int long long in) { *stream << in; }
-    void toStream(std::ostream* stream, int long long unsigned in) { *stream << in; }
-#endif // DOCTEST_CONFIG_WITH_LONG_LONG
-
-    void addToContexts(IContextScope* ptr) { contextState->contexts.push_back(ptr); }
-    void                              popFromContexts() { contextState->contexts.pop_back(); }
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable : 4996) // std::uncaught_exception is deprecated in C++17
-#endif
-    void useContextIfExceptionOccurred(IContextScope* ptr) {
-        if(std::uncaught_exception()) {
-            std::ostringstream stream;
-            ptr->build(&stream);
-            contextState->exceptionalContexts.push_back(stream.str());
-        }
-    }
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif
-
-    void printSummary();
-
-#if !defined(DOCTEST_CONFIG_POSIX_SIGNALS) && !defined(DOCTEST_CONFIG_WINDOWS_SEH)
-    void reportFatal(const std::string&) {}
-    struct FatalConditionHandler
-    {
-        void reset() {}
-    };
-#else // DOCTEST_CONFIG_POSIX_SIGNALS || DOCTEST_CONFIG_WINDOWS_SEH
-
-    void reportFatal(const std::string& message) {
-        DOCTEST_LOG_START();
-
-        contextState->numAssertions += contextState->numAssertionsForCurrentTestcase;
-        logTestException(message.c_str(), true);
-        logTestEnd();
-        contextState->numFailed++;
-
-        printSummary();
-    }
-
-#ifdef DOCTEST_PLATFORM_WINDOWS
-
-    struct SignalDefs
-    {
-        DWORD       id;
-        const char* name;
-    };
-    // There is no 1-1 mapping between signals and windows exceptions.
-    // Windows can easily distinguish between SO and SigSegV,
-    // but SigInt, SigTerm, etc are handled differently.
-    SignalDefs signalDefs[] = {
-            {EXCEPTION_ILLEGAL_INSTRUCTION, "SIGILL - Illegal instruction signal"},
-            {EXCEPTION_STACK_OVERFLOW, "SIGSEGV - Stack overflow"},
-            {EXCEPTION_ACCESS_VIOLATION, "SIGSEGV - Segmentation violation signal"},
-            {EXCEPTION_INT_DIVIDE_BY_ZERO, "Divide by zero error"},
-    };
-
-    struct FatalConditionHandler
-    {
-        static LONG CALLBACK handleVectoredException(PEXCEPTION_POINTERS ExceptionInfo) {
-            for(size_t i = 0; i < sizeof(signalDefs) / sizeof(SignalDefs); ++i) {
-                if(ExceptionInfo->ExceptionRecord->ExceptionCode == signalDefs[i].id) {
-                    reportFatal(signalDefs[i].name);
-                }
-            }
-            // If its not an exception we care about, pass it along.
-            // This stops us from eating debugger breaks etc.
-            return EXCEPTION_CONTINUE_SEARCH;
-        }
-
-        FatalConditionHandler() {
-            isSet = true;
-            // 32k seems enough for doctest to handle stack overflow,
-            // but the value was found experimentally, so there is no strong guarantee
-            guaranteeSize          = 32 * 1024;
-            exceptionHandlerHandle = 0;
-            // Register as first handler in current chain
-            exceptionHandlerHandle = AddVectoredExceptionHandler(1, handleVectoredException);
-            // Pass in guarantee size to be filled
-            SetThreadStackGuarantee(&guaranteeSize);
-        }
-
-        static void reset() {
-            if(isSet) {
-                // Unregister handler and restore the old guarantee
-                RemoveVectoredExceptionHandler(exceptionHandlerHandle);
-                SetThreadStackGuarantee(&guaranteeSize);
-                exceptionHandlerHandle = 0;
-                isSet                  = false;
-            }
-        }
-
-        ~FatalConditionHandler() { reset(); }
-
-    private:
-        static bool  isSet;
-        static ULONG guaranteeSize;
-        static PVOID exceptionHandlerHandle;
-    };
-
-    bool  FatalConditionHandler::isSet                  = false;
-    ULONG FatalConditionHandler::guaranteeSize          = 0;
-    PVOID FatalConditionHandler::exceptionHandlerHandle = 0;
-
-#else // DOCTEST_PLATFORM_WINDOWS
-
-    struct SignalDefs
-    {
-        int         id;
-        const char* name;
-    };
-    SignalDefs signalDefs[] = {{SIGINT, "SIGINT - Terminal interrupt signal"},
-                               {SIGILL, "SIGILL - Illegal instruction signal"},
-                               {SIGFPE, "SIGFPE - Floating point error signal"},
-                               {SIGSEGV, "SIGSEGV - Segmentation violation signal"},
-                               {SIGTERM, "SIGTERM - Termination request signal"},
-                               {SIGABRT, "SIGABRT - Abort (abnormal termination) signal"}};
-
-    struct FatalConditionHandler
-    {
-        static bool             isSet;
-        static struct sigaction oldSigActions[sizeof(signalDefs) / sizeof(SignalDefs)];
-        static stack_t          oldSigStack;
-        static char             altStackMem[SIGSTKSZ];
-
-        static void handleSignal(int sig) {
-            std::string name = "<unknown signal>";
-            for(std::size_t i = 0; i < sizeof(signalDefs) / sizeof(SignalDefs); ++i) {
-                SignalDefs& def = signalDefs[i];
-                if(sig == def.id) {
-                    name = def.name;
-                    break;
-                }
-            }
-            reset();
-            reportFatal(name);
-            raise(sig);
-        }
-
-        FatalConditionHandler() {
-            isSet = true;
-            stack_t sigStack;
-            sigStack.ss_sp    = altStackMem;
-            sigStack.ss_size  = SIGSTKSZ;
-            sigStack.ss_flags = 0;
-            sigaltstack(&sigStack, &oldSigStack);
-            struct sigaction sa = {0};
-
-            sa.sa_handler = handleSignal; // NOLINT
-            sa.sa_flags   = SA_ONSTACK;
-            for(std::size_t i = 0; i < sizeof(signalDefs) / sizeof(SignalDefs); ++i) {
-                sigaction(signalDefs[i].id, &sa, &oldSigActions[i]);
-            }
-        }
-
-        ~FatalConditionHandler() { reset(); }
-        static void reset() {
-            if(isSet) {
-                // Set signals back to previous values -- hopefully nobody overwrote them in the meantime
-                for(std::size_t i = 0; i < sizeof(signalDefs) / sizeof(SignalDefs); ++i) {
-                    sigaction(signalDefs[i].id, &oldSigActions[i], 0);
-                }
-                // Return the old stack
-                sigaltstack(&oldSigStack, 0);
-                isSet = false;
-            }
-        }
-    };
-
-    bool             FatalConditionHandler::isSet = false;
-    struct sigaction FatalConditionHandler::oldSigActions[sizeof(signalDefs) / sizeof(SignalDefs)] =
-            {};
-    stack_t FatalConditionHandler::oldSigStack           = {};
-    char    FatalConditionHandler::altStackMem[SIGSTKSZ] = {};
-
-#endif // DOCTEST_PLATFORM_WINDOWS
-#endif // DOCTEST_CONFIG_POSIX_SIGNALS || DOCTEST_CONFIG_WINDOWS_SEH
-
-    // depending on the current options this will remove the path of filenames
-    const char* fileForOutput(const char* file) {
-        if(contextState->no_path_in_filenames) {
-            const char* back    = std::strrchr(file, '\\');
-            const char* forward = std::strrchr(file, '/');
-            if(back || forward) {
-                if(back > forward)
-                    forward = back;
-                return forward + 1;
-            }
-        }
-        return file;
-    }
-
-    // depending on the current options this will substitute the line numbers with 0
-    int lineForOutput(int line) {
-        if(contextState->no_line_numbers)
-            return 0;
-        return line;
-    }
-
-#ifdef DOCTEST_PLATFORM_MAC
-#include <sys/types.h>
-#include <unistd.h>
-#include <sys/sysctl.h>
-    // The following function is taken directly from the following technical note:
-    // http://developer.apple.com/library/mac/#qa/qa2004/qa1361.html
-    // Returns true if the current process is being debugged (either
-    // running under the debugger or has a debugger attached post facto).
-    bool isDebuggerActive() {
-        int        mib[4];
-        kinfo_proc info;
-        size_t     size;
-        // Initialize the flags so that, if sysctl fails for some bizarre
-        // reason, we get a predictable result.
-        info.kp_proc.p_flag = 0;
-        // Initialize mib, which tells sysctl the info we want, in this case
-        // we're looking for information about a specific process ID.
-        mib[0] = CTL_KERN;
-        mib[1] = KERN_PROC;
-        mib[2] = KERN_PROC_PID;
-        mib[3] = getpid();
-        // Call sysctl.
-        size = sizeof(info);
-        if(sysctl(mib, sizeof(mib) / sizeof(*mib), &info, &size, 0, 0) != 0) {
-            fprintf(stderr, "\n** Call to sysctl failed - unable to determine if debugger is "
-                            "active **\n\n");
-            return false;
-        }
-        // We're being debugged if the P_TRACED flag is set.
-        return ((info.kp_proc.p_flag & P_TRACED) != 0);
-    }
-#elif defined(_MSC_VER) || defined(__MINGW32__)
-    bool  isDebuggerActive() { return ::IsDebuggerPresent() != 0; }
-#else
-    bool isDebuggerActive() { return false; }
-#endif // Platform
-
-#ifdef DOCTEST_PLATFORM_WINDOWS
-    void myOutputDebugString(const String& text) { ::OutputDebugStringA(text.c_str()); }
-#else
-    // TODO: integration with XCode and other IDEs
-    void myOutputDebugString(const String&) {}
-#endif // Platform
-
-    const char* getSeparator() {
-        return "===============================================================================\n";
-    }
-
-    void printToDebugConsole(const String& text) {
-        if(isDebuggerActive())
-            myOutputDebugString(text.c_str());
-    }
-
-    void addFailedAssert(assertType::Enum assert_type) {
-        if((assert_type & assertType::is_warn) == 0) { //!OCLINT bitwise operator in conditional
-            contextState->numFailedAssertions++;
-            contextState->numFailedAssertionsForCurrentTestcase++;
-            contextState->hasCurrentTestFailed = true;
-        }
-    }
-
-    void logTestStart(const TestCase& tc) {
-        char loc[DOCTEST_SNPRINTF_BUFFER_LENGTH];
-        DOCTEST_SNPRINTF(loc, DOCTEST_COUNTOF(loc), "%s(%d)\n", fileForOutput(tc.m_file),
-                         lineForOutput(tc.m_line));
-
-        char ts1[DOCTEST_SNPRINTF_BUFFER_LENGTH];
-        DOCTEST_SNPRINTF(ts1, DOCTEST_COUNTOF(ts1), "TEST SUITE: ");
-        char ts2[DOCTEST_SNPRINTF_BUFFER_LENGTH];
-        DOCTEST_SNPRINTF(ts2, DOCTEST_COUNTOF(ts2), "%s\n", tc.m_test_suite);
-        char n1[DOCTEST_SNPRINTF_BUFFER_LENGTH];
-        DOCTEST_SNPRINTF(n1, DOCTEST_COUNTOF(n1), "TEST CASE:  ");
-        char n2[DOCTEST_SNPRINTF_BUFFER_LENGTH];
-        DOCTEST_SNPRINTF(n2, DOCTEST_COUNTOF(n2), "%s\n", tc.m_name);
-        char d1[DOCTEST_SNPRINTF_BUFFER_LENGTH];
-        DOCTEST_SNPRINTF(d1, DOCTEST_COUNTOF(d1), "DESCRIPTION: ");
-        char d2[DOCTEST_SNPRINTF_BUFFER_LENGTH];
-        DOCTEST_SNPRINTF(d2, DOCTEST_COUNTOF(d2), "%s\n", tc.m_description);
-
-        // hack for BDD style of macros - to not print "TEST CASE:"
-        char scenario[] = "  Scenario:";
-        if(std::string(tc.m_name).substr(0, DOCTEST_COUNTOF(scenario) - 1) == scenario)
-            n1[0] = '\0';
-
-        DOCTEST_PRINTF_COLORED(getSeparator(), Color::Yellow);
-        DOCTEST_PRINTF_COLORED(loc, Color::LightGrey);
-
-        String forDebugConsole;
-        if(tc.m_description) {
-            DOCTEST_PRINTF_COLORED(d1, Color::Yellow);
-            DOCTEST_PRINTF_COLORED(d2, Color::None);
-            forDebugConsole += d1;
-            forDebugConsole += d2;
-        }
-        if(tc.m_test_suite[0] != '\0') {
-            DOCTEST_PRINTF_COLORED(ts1, Color::Yellow);
-            DOCTEST_PRINTF_COLORED(ts2, Color::None);
-            forDebugConsole += ts1;
-            forDebugConsole += ts2;
-        }
-        DOCTEST_PRINTF_COLORED(n1, Color::Yellow);
-        DOCTEST_PRINTF_COLORED(n2, Color::None);
-
-        String                subcaseStuff;
-        std::vector<Subcase>& subcasesStack = contextState->subcasesStack;
-        for(unsigned i = 0; i < subcasesStack.size(); ++i) {
-            if(subcasesStack[i].m_signature.m_name[0] != '\0') {
-                char subcase[DOCTEST_SNPRINTF_BUFFER_LENGTH];
-                DOCTEST_SNPRINTF(subcase, DOCTEST_COUNTOF(loc), "  %s\n",
-                                 subcasesStack[i].m_signature.m_name);
-                DOCTEST_PRINTF_COLORED(subcase, Color::None);
-                subcaseStuff += subcase;
-            }
-        }
-
-        DOCTEST_PRINTF_COLORED("\n", Color::None);
-
-        printToDebugConsole(String(getSeparator()) + loc + forDebugConsole.c_str() + n1 + n2 +
-                            subcaseStuff.c_str() + "\n");
-    }
-
-    void logTestEnd() {}
-
-    void logTestException(const String& what, bool crash) {
-        char msg[DOCTEST_SNPRINTF_BUFFER_LENGTH];
-
-        DOCTEST_SNPRINTF(msg, DOCTEST_COUNTOF(msg), "TEST CASE FAILED!\n");
-
-        char info1[DOCTEST_SNPRINTF_BUFFER_LENGTH];
-        char info2[DOCTEST_SNPRINTF_BUFFER_LENGTH];
-        info1[0] = 0;
-        info2[0] = 0;
-        DOCTEST_SNPRINTF(info1, DOCTEST_COUNTOF(info1),
-                         crash ? "crashed:\n" : "threw exception:\n");
-        DOCTEST_SNPRINTF(info2, DOCTEST_COUNTOF(info2), "  %s\n", what.c_str());
-
-        std::string contextStr;
-
-        if(!contextState->exceptionalContexts.empty()) {
-            contextStr += "with context:\n";
-            for(size_t i = contextState->exceptionalContexts.size(); i > 0; --i) {
-                contextStr += "  ";
-                contextStr += contextState->exceptionalContexts[i - 1];
-                contextStr += "\n";
-            }
-        }
-
-        DOCTEST_PRINTF_COLORED(msg, Color::Red);
-        DOCTEST_PRINTF_COLORED(info1, Color::None);
-        DOCTEST_PRINTF_COLORED(info2, Color::Cyan);
-        DOCTEST_PRINTF_COLORED(contextStr.c_str(), Color::None);
-        DOCTEST_PRINTF_COLORED("\n", Color::None);
-
-        printToDebugConsole(String(msg) + info1 + info2 + contextStr.c_str() + "\n");
-    }
-
-    String logContext() {
-        std::ostringstream           stream;
-        std::vector<IContextScope*>& contexts = contextState->contexts;
-        if(!contexts.empty())
-            stream << "with context:\n";
-        for(size_t i = 0; i < contexts.size(); ++i) {
-            stream << "  ";
-            contexts[i]->build(&stream);
-            stream << "\n";
-        }
-        return stream.str().c_str();
-    }
-
-    const char* getFailString(assertType::Enum assert_type) {
-        if(assert_type & assertType::is_warn) //!OCLINT bitwise operator in conditional
-            return "WARNING";
-        if(assert_type & assertType::is_check) //!OCLINT bitwise operator in conditional
-            return "ERROR";
-        if(assert_type & assertType::is_require) //!OCLINT bitwise operator in conditional
-            return "FATAL ERROR";
-        return "";
-    }
-
-    void logAssert(bool passed, const char* decomposition, bool threw, const String& exception,
-                   const char* expr, assertType::Enum assert_type, const char* file, int line) {
-        char loc[DOCTEST_SNPRINTF_BUFFER_LENGTH];
-        DOCTEST_SNPRINTF(loc, DOCTEST_COUNTOF(loc), "%s(%d)", fileForOutput(file),
-                         lineForOutput(line));
-
-        char msg[DOCTEST_SNPRINTF_BUFFER_LENGTH];
-        DOCTEST_SNPRINTF(msg, DOCTEST_COUNTOF(msg), " %s!\n",
-                         passed ? "PASSED" : getFailString(assert_type));
-
-        char info1[DOCTEST_SNPRINTF_BUFFER_LENGTH];
-        DOCTEST_SNPRINTF(info1, DOCTEST_COUNTOF(info1), "  %s( %s )\n",
-                         getAssertString(assert_type), expr);
-
-        char info2[DOCTEST_SNPRINTF_BUFFER_LENGTH];
-        char info3[DOCTEST_SNPRINTF_BUFFER_LENGTH];
-        info2[0] = 0;
-        info3[0] = 0;
-        if(threw) {
-            DOCTEST_SNPRINTF(info2, DOCTEST_COUNTOF(info2), "threw exception:\n");
-            DOCTEST_SNPRINTF(info3, DOCTEST_COUNTOF(info3), "  %s\n", exception.c_str());
-        } else {
-            DOCTEST_SNPRINTF(info2, DOCTEST_COUNTOF(info2), "with expansion:\n");
-            DOCTEST_SNPRINTF(info3, DOCTEST_COUNTOF(info3), "  %s( %s )\n",
-                             getAssertString(assert_type), decomposition);
-        }
-
-        const bool isWarn = assert_type & assertType::is_warn;
-        DOCTEST_PRINTF_COLORED(loc, Color::LightGrey);
-        DOCTEST_PRINTF_COLORED(msg,
-                               passed ? Color::BrightGreen : isWarn ? Color::Yellow : Color::Red);
-        DOCTEST_PRINTF_COLORED(info1, Color::Cyan);
-        DOCTEST_PRINTF_COLORED(info2, Color::None);
-        DOCTEST_PRINTF_COLORED(info3, Color::Cyan);
-        String context = logContext();
-        DOCTEST_PRINTF_COLORED(context.c_str(), Color::None);
-        DOCTEST_PRINTF_COLORED("\n", Color::None);
-
-        printToDebugConsole(String(loc) + msg + info1 + info2 + info3 + context.c_str() + "\n");
-    }
-
-    void logAssertThrows(bool threw, const char* expr, assertType::Enum assert_type,
-                         const char* file, int line) {
-        char loc[DOCTEST_SNPRINTF_BUFFER_LENGTH];
-        DOCTEST_SNPRINTF(loc, DOCTEST_COUNTOF(loc), "%s(%d)", fileForOutput(file),
-                         lineForOutput(line));
-
-        char msg[DOCTEST_SNPRINTF_BUFFER_LENGTH];
-        DOCTEST_SNPRINTF(msg, DOCTEST_COUNTOF(msg), " %s!\n",
-                         threw ? "PASSED" : getFailString(assert_type));
-
-        char info1[DOCTEST_SNPRINTF_BUFFER_LENGTH];
-        DOCTEST_SNPRINTF(info1, DOCTEST_COUNTOF(info1), "  %s( %s )\n",
-                         getAssertString(assert_type), expr);
-
-        char info2[DOCTEST_SNPRINTF_BUFFER_LENGTH];
-        info2[0] = 0;
-
-        if(!threw)
-            DOCTEST_SNPRINTF(info2, DOCTEST_COUNTOF(info2), "didn't throw at all\n");
-
-        const bool isWarn = assert_type & assertType::is_warn;
-        DOCTEST_PRINTF_COLORED(loc, Color::LightGrey);
-        DOCTEST_PRINTF_COLORED(msg,
-                               threw ? Color::BrightGreen : isWarn ? Color::Yellow : Color::Red);
-        DOCTEST_PRINTF_COLORED(info1, Color::Cyan);
-        DOCTEST_PRINTF_COLORED(info2, Color::None);
-        String context = logContext();
-        DOCTEST_PRINTF_COLORED(context.c_str(), Color::None);
-        DOCTEST_PRINTF_COLORED("\n", Color::None);
-
-        printToDebugConsole(String(loc) + msg + info1 + info2 + context.c_str() + "\n");
-    }
-
-    void logAssertThrowsAs(bool threw, bool threw_as, const char* as, const String& exception,
-                           const char* expr, assertType::Enum assert_type, const char* file,
-                           int line) {
-        char loc[DOCTEST_SNPRINTF_BUFFER_LENGTH];
-        DOCTEST_SNPRINTF(loc, DOCTEST_COUNTOF(loc), "%s(%d)", fileForOutput(file),
-                         lineForOutput(line));
-
-        char msg[DOCTEST_SNPRINTF_BUFFER_LENGTH];
-        DOCTEST_SNPRINTF(msg, DOCTEST_COUNTOF(msg), " %s!\n",
-                         threw_as ? "PASSED" : getFailString(assert_type));
-
-        char info1[DOCTEST_SNPRINTF_BUFFER_LENGTH];
-        DOCTEST_SNPRINTF(info1, DOCTEST_COUNTOF(info1), "  %s( %s, %s )\n",
-                         getAssertString(assert_type), expr, as);
-
-        char info2[DOCTEST_SNPRINTF_BUFFER_LENGTH];
-        char info3[DOCTEST_SNPRINTF_BUFFER_LENGTH];
-        info2[0] = 0;
-        info3[0] = 0;
-
-        if(!threw) { //!OCLINT inverted logic
-            DOCTEST_SNPRINTF(info2, DOCTEST_COUNTOF(info2), "didn't throw at all\n");
-        } else if(!threw_as) {
-            DOCTEST_SNPRINTF(info2, DOCTEST_COUNTOF(info2), "threw a different exception:\n");
-            DOCTEST_SNPRINTF(info3, DOCTEST_COUNTOF(info3), "  %s\n", exception.c_str());
-        }
-
-        const bool isWarn = assert_type & assertType::is_warn;
-        DOCTEST_PRINTF_COLORED(loc, Color::LightGrey);
-        DOCTEST_PRINTF_COLORED(msg,
-                               threw_as ? Color::BrightGreen : isWarn ? Color::Yellow : Color::Red);
-        DOCTEST_PRINTF_COLORED(info1, Color::Cyan);
-        DOCTEST_PRINTF_COLORED(info2, Color::None);
-        DOCTEST_PRINTF_COLORED(info3, Color::Cyan);
-        String context = logContext();
-        DOCTEST_PRINTF_COLORED(context.c_str(), Color::None);
-        DOCTEST_PRINTF_COLORED("\n", Color::None);
-
-        printToDebugConsole(String(loc) + msg + info1 + info2 + info3 + context.c_str() + "\n");
-    }
-
-    void logAssertNothrow(bool threw, const String& exception, const char* expr,
-                          assertType::Enum assert_type, const char* file, int line) {
-        char loc[DOCTEST_SNPRINTF_BUFFER_LENGTH];
-        DOCTEST_SNPRINTF(loc, DOCTEST_COUNTOF(loc), "%s(%d)", fileForOutput(file),
-                         lineForOutput(line));
-
-        char msg[DOCTEST_SNPRINTF_BUFFER_LENGTH];
-        DOCTEST_SNPRINTF(msg, DOCTEST_COUNTOF(msg), " %s!\n",
-                         threw ? getFailString(assert_type) : "PASSED");
-
-        char info1[DOCTEST_SNPRINTF_BUFFER_LENGTH];
-        DOCTEST_SNPRINTF(info1, DOCTEST_COUNTOF(info1), "  %s( %s )\n",
-                         getAssertString(assert_type), expr);
-
-        char info2[DOCTEST_SNPRINTF_BUFFER_LENGTH];
-        char info3[DOCTEST_SNPRINTF_BUFFER_LENGTH];
-        info2[0] = 0;
-        info3[0] = 0;
-        if(threw) {
-            DOCTEST_SNPRINTF(info2, DOCTEST_COUNTOF(info2), "threw exception:\n");
-            DOCTEST_SNPRINTF(info3, DOCTEST_COUNTOF(info3), "  %s\n", exception.c_str());
-        }
-
-        const bool isWarn = assert_type & assertType::is_warn;
-        DOCTEST_PRINTF_COLORED(loc, Color::LightGrey);
-        DOCTEST_PRINTF_COLORED(msg,
-                               threw ? isWarn ? Color::Yellow : Color::Red : Color::BrightGreen);
-        DOCTEST_PRINTF_COLORED(info1, Color::Cyan);
-        DOCTEST_PRINTF_COLORED(info2, Color::None);
-        DOCTEST_PRINTF_COLORED(info3, Color::Cyan);
-        String context = logContext();
-        DOCTEST_PRINTF_COLORED(context.c_str(), Color::None);
-        DOCTEST_PRINTF_COLORED("\n", Color::None);
-
-        printToDebugConsole(String(loc) + msg + info1 + info2 + info3 + context.c_str() + "\n");
-    }
-
-    ResultBuilder::ResultBuilder(assertType::Enum assert_type, const char* file, int line,
-                                 const char* expr, const char* exception_type)
-            : m_assert_type(assert_type)
-            , m_file(file)
-            , m_line(line)
-            , m_expr(expr)
-            , m_exception_type(exception_type)
-            , m_threw(false)
-            , m_threw_as(false)
-            , m_failed(false) {
-#ifdef _MSC_VER
-        if(m_expr[0] == ' ') // this happens when variadic macros are disabled under MSVC
-            ++m_expr;
-#endif // _MSC_VER
-    }
-
-    ResultBuilder::~ResultBuilder() {}
-
-    void ResultBuilder::unexpectedExceptionOccurred() {
-        m_threw = true;
-
-        m_exception = translateActiveException();
-    }
-
-    bool ResultBuilder::log() {
-        if((m_assert_type & assertType::is_warn) == 0) //!OCLINT bitwise operator in conditional
-            contextState->numAssertionsForCurrentTestcase++;
-
-        if(m_assert_type & assertType::is_throws) { //!OCLINT bitwise operator in conditional
-            m_failed = !m_threw;
-        } else if(m_assert_type & //!OCLINT bitwise operator in conditional
-                  assertType::is_throws_as) {
-            m_failed = !m_threw_as;
-        } else if(m_assert_type & //!OCLINT bitwise operator in conditional
-                  assertType::is_nothrow) {
-            m_failed = m_threw;
-        } else {
-            m_failed = m_result;
-        }
-
-        if(m_failed || contextState->success) {
-            DOCTEST_LOG_START();
-
-            if(m_assert_type & assertType::is_throws) { //!OCLINT bitwise operator in conditional
-                logAssertThrows(m_threw, m_expr, m_assert_type, m_file, m_line);
-            } else if(m_assert_type & //!OCLINT bitwise operator in conditional
-                      assertType::is_throws_as) {
-                logAssertThrowsAs(m_threw, m_threw_as, m_exception_type, m_exception, m_expr,
-                                  m_assert_type, m_file, m_line);
-            } else if(m_assert_type & //!OCLINT bitwise operator in conditional
-                      assertType::is_nothrow) {
-                logAssertNothrow(m_threw, m_exception, m_expr, m_assert_type, m_file, m_line);
-            } else {
-                logAssert(m_result.m_passed, m_result.m_decomposition.c_str(), m_threw, m_exception,
-                          m_expr, m_assert_type, m_file, m_line);
-            }
-        }
-
-        if(m_failed)
-            addFailedAssert(m_assert_type);
-
-        return m_failed && isDebuggerActive() && !contextState->no_breaks; // break into debugger
-    }
-
-    void ResultBuilder::react() const {
-        if(m_failed && checkIfShouldThrow(m_assert_type))
-            throwException();
-    }
-
-    MessageBuilder::MessageBuilder(const char* file, int line, assertType::Enum severity)
-            : m_stream(createStream())
-            , m_file(file)
-            , m_line(line)
-            , m_severity(severity) {}
-
-    bool MessageBuilder::log() {
-        DOCTEST_LOG_START();
-
-        const bool isWarn = m_severity & assertType::is_warn;
-
-        // warn is just a message in this context so we dont treat it as an assert
-        if(!isWarn) {
-            contextState->numAssertionsForCurrentTestcase++;
-            addFailedAssert(m_severity);
-        }
-
-        char loc[DOCTEST_SNPRINTF_BUFFER_LENGTH];
-        DOCTEST_SNPRINTF(loc, DOCTEST_COUNTOF(loc), "%s(%d)", fileForOutput(m_file),
-                         lineForOutput(m_line));
-        char msg[DOCTEST_SNPRINTF_BUFFER_LENGTH];
-        DOCTEST_SNPRINTF(msg, DOCTEST_COUNTOF(msg), " %s!\n",
-                         isWarn ? "MESSAGE" : getFailString(m_severity));
-
-        DOCTEST_PRINTF_COLORED(loc, Color::LightGrey);
-        DOCTEST_PRINTF_COLORED(msg, isWarn ? Color::Yellow : Color::Red);
-
-        String info = getStreamResult(m_stream);
-        if(info.size()) {
-            DOCTEST_PRINTF_COLORED("  ", Color::None);
-            DOCTEST_PRINTF_COLORED(info.c_str(), Color::None);
-            DOCTEST_PRINTF_COLORED("\n", Color::None);
-        }
-        String context = logContext();
-        DOCTEST_PRINTF_COLORED(context.c_str(), Color::None);
-        DOCTEST_PRINTF_COLORED("\n", Color::None);
-
-        printToDebugConsole(String(loc) + msg + "  " + info.c_str() + "\n" + context.c_str() +
-                            "\n");
-
-        return isDebuggerActive() && !contextState->no_breaks && !isWarn; // break into debugger
-    }
-
-    void MessageBuilder::react() {
-        if(m_severity & assertType::is_require) //!OCLINT bitwise operator in conditional
-            throwException();
-    }
-
-    MessageBuilder::~MessageBuilder() { freeStream(m_stream); }
-
-    // the implementation of parseFlag()
-    bool parseFlagImpl(int argc, const char* const* argv, const char* pattern) {
-        for(int i = argc - 1; i >= 0; --i) {
-            const char* temp = std::strstr(argv[i], pattern);
-            if(temp && my_strlen(temp) == my_strlen(pattern)) {
-                // eliminate strings in which the chars before the option are not '-'
-                bool noBadCharsFound = true; //!OCLINT prefer early exits and continue
-                while(temp != argv[i]) {
-                    if(*--temp != '-') {
-                        noBadCharsFound = false;
-                        break;
-                    }
-                }
-                if(noBadCharsFound && argv[i][0] == '-')
-                    return true;
-            }
-        }
-        return false;
-    }
-
-    // locates a flag on the command line
-    bool parseFlag(int argc, const char* const* argv, const char* pattern) {
-#ifndef DOCTEST_CONFIG_NO_UNPREFIXED_OPTIONS
-        if(!parseFlagImpl(argc, argv, pattern))
-            return parseFlagImpl(argc, argv, pattern + 3); // 3 for "dt-"
-        return true;
-#else  // DOCTEST_CONFIG_NO_UNPREFIXED_OPTIONS
-        return parseFlagImpl(argc, argv, pattern);
-#endif // DOCTEST_CONFIG_NO_UNPREFIXED_OPTIONS
-    }
-
-    // the implementation of parseOption()
-    bool parseOptionImpl(int argc, const char* const* argv, const char* pattern, String& res) {
-        for(int i = argc - 1; i >= 0; --i) {
-            const char* temp = std::strstr(argv[i], pattern);
-            if(temp) { //!OCLINT prefer early exits and continue
-                // eliminate matches in which the chars before the option are not '-'
-                bool        noBadCharsFound = true;
-                const char* curr            = argv[i];
-                while(curr != temp) {
-                    if(*curr++ != '-') {
-                        noBadCharsFound = false;
-                        break;
-                    }
-                }
-                if(noBadCharsFound && argv[i][0] == '-') {
-                    temp += my_strlen(pattern);
-                    const unsigned len = my_strlen(temp);
-                    if(len) {
-                        res = temp;
-                        return true;
-                    }
-                }
-            }
-        }
-        return false;
-    }
-
-    // parses an option and returns the string after the '=' character
-    bool parseOption(int argc, const char* const* argv, const char* pattern, String& res,
-                     const String& defaultVal = String()) {
-        res = defaultVal;
-#ifndef DOCTEST_CONFIG_NO_UNPREFIXED_OPTIONS
-        if(!parseOptionImpl(argc, argv, pattern, res))
-            return parseOptionImpl(argc, argv, pattern + 3, res); // 3 for "dt-"
-        return true;
-#else // DOCTEST_CONFIG_NO_UNPREFIXED_OPTIONS
-        return parseOptionImpl(argc, argv, pattern, res);
-#endif // DOCTEST_CONFIG_NO_UNPREFIXED_OPTIONS
-    }
-
-    // parses a comma separated list of words after a pattern in one of the arguments in argv
-    bool parseCommaSepArgs(int argc, const char* const* argv, const char* pattern,
-                           std::vector<String>& res) {
-        String filtersString;
-        if(parseOption(argc, argv, pattern, filtersString)) {
-            // tokenize with "," as a separator
-            // cppcheck-suppress strtokCalled
-            char* pch = std::strtok(filtersString.c_str(), ","); // modifies the string
-            while(pch != 0) {
-                if(my_strlen(pch))
-                    res.push_back(pch);
-                // uses the strtok() internal state to go to the next token
-                // cppcheck-suppress strtokCalled
-                pch = std::strtok(0, ",");
-            }
-            return true;
-        }
-        return false;
-    }
-
-    enum optionType
-    {
-        option_bool,
-        option_int
-    };
-
-    // parses an int/bool option from the command line
-    bool parseIntOption(int argc, const char* const* argv, const char* pattern, optionType type,
-                        int& res) {
-        String parsedValue;
-        if(!parseOption(argc, argv, pattern, parsedValue))
-            return false;
-
-        if(type == 0) {
-            // boolean
-            const char positive[][5] = {"1", "true", "on", "yes"};  // 5 - strlen("true") + 1
-            const char negative[][6] = {"0", "false", "off", "no"}; // 6 - strlen("false") + 1
-
-            // if the value matches any of the positive/negative possibilities
-            for(unsigned i = 0; i < 4; i++) {
-                if(parsedValue.compare(positive[i], true) == 0) {
-                    res = 1; //!OCLINT parameter reassignment
-                    return true;
-                }
-                if(parsedValue.compare(negative[i], true) == 0) {
-                    res = 0; //!OCLINT parameter reassignment
-                    return true;
-                }
-            }
-        } else {
-            // integer
-            int theInt = std::atoi(parsedValue.c_str()); // NOLINT
-            if(theInt != 0) {
-                res = theInt; //!OCLINT parameter reassignment
-                return true;
-            }
-        }
-        return false;
-    }
-
-    void printVersion() {
-        if(contextState->no_version == false) {
-            DOCTEST_PRINTF_COLORED("[doctest] ", Color::Cyan);
-            std::printf("doctest version is \"%s\"\n", DOCTEST_VERSION_STR);
-        }
-    }
-
-    void printHelp() {
-        printVersion();
-        // clang-format off
-        DOCTEST_PRINTF_COLORED("[doctest]\n", Color::Cyan);
-        DOCTEST_PRINTF_COLORED("[doctest] ", Color::Cyan);
-        std::printf("boolean values: \"1/on/yes/true\" or \"0/off/no/false\"\n");
-        DOCTEST_PRINTF_COLORED("[doctest] ", Color::Cyan);
-        std::printf("filter  values: \"str1,str2,str3\" (comma separated strings)\n");
-        DOCTEST_PRINTF_COLORED("[doctest]\n", Color::Cyan);
-        DOCTEST_PRINTF_COLORED("[doctest] ", Color::Cyan);
-        std::printf("filters use wildcards for matching strings\n");
-        DOCTEST_PRINTF_COLORED("[doctest] ", Color::Cyan);
-        std::printf("something passes a filter if any of the strings in a filter matches\n");
-        DOCTEST_PRINTF_COLORED("[doctest]\n", Color::Cyan);
-        DOCTEST_PRINTF_COLORED("[doctest] ", Color::Cyan);
-        std::printf("ALL FLAGS, OPTIONS AND FILTERS ALSO AVAILABLE WITH A \"dt-\" PREFIX!!!\n");
-        DOCTEST_PRINTF_COLORED("[doctest]\n", Color::Cyan);
-        DOCTEST_PRINTF_COLORED("[doctest] ", Color::Cyan);
-        std::printf("Query flags - the program quits after them. Available:\n\n");
-        std::printf(" -?,   --help, -h                      prints this message\n");
-        std::printf(" -v,   --version                       prints the version\n");
-        std::printf(" -c,   --count                         prints the number of matching tests\n");
-        std::printf(" -ltc, --list-test-cases               lists all matching tests by name\n");
-        std::printf(" -lts, --list-test-suites              lists all matching test suites\n\n");
-        // ========================================================================================= << 79
-        DOCTEST_PRINTF_COLORED("[doctest] ", Color::Cyan);
-        std::printf("The available <int>/<string> options/filters are:\n\n");
-        std::printf(" -tc,  --test-case=<filters>           filters     tests by their name\n");
-        std::printf(" -tce, --test-case-exclude=<filters>   filters OUT tests by their name\n");
-        std::printf(" -sf,  --source-file=<filters>         filters     tests by their file\n");
-        std::printf(" -sfe, --source-file-exclude=<filters> filters OUT tests by their file\n");
-        std::printf(" -ts,  --test-suite=<filters>          filters     tests by their test suite\n");
-        std::printf(" -tse, --test-suite-exclude=<filters>  filters OUT tests by their test suite\n");
-        std::printf(" -sc,  --subcase=<filters>             filters     subcases by their name\n");
-        std::printf(" -sce, --subcase-exclude=<filters>     filters OUT subcases by their name\n");
-        std::printf(" -ob,  --order-by=<string>             how the tests should be ordered\n");
-        std::printf("                                       <string> - by [file/suite/name/rand]\n");
-        std::printf(" -rs,  --rand-seed=<int>               seed for random ordering\n");
-        std::printf(" -f,   --first=<int>                   the first test passing the filters to\n");
-        std::printf("                                       execute - for range-based execution\n");
-        std::printf(" -l,   --last=<int>                    the last test passing the filters to\n");
-        std::printf("                                       execute - for range-based execution\n");
-        std::printf(" -aa,  --abort-after=<int>             stop after <int> failed assertions\n");
-        std::printf(" -scfl,--subcase-filter-levels=<int>   apply filters for the first <int> levels\n");
-        DOCTEST_PRINTF_COLORED("\n[doctest] ", Color::Cyan);
-        std::printf("Bool options - can be used like flags and true is assumed. Available:\n\n");
-        std::printf(" -s,   --success=<bool>                include successful assertions in output\n");
-        std::printf(" -cs,  --case-sensitive=<bool>         filters being treated as case sensitive\n");
-        std::printf(" -e,   --exit=<bool>                   exits after the tests finish\n");
-        std::printf(" -d,   --duration=<bool>               prints the time duration of each test\n");
-        std::printf(" -nt,  --no-throw=<bool>               skips exceptions-related assert checks\n");
-        std::printf(" -ne,  --no-exitcode=<bool>            returns (or exits) always with success\n");
-        std::printf(" -nr,  --no-run=<bool>                 skips all runtime doctest operations\n");
-        std::printf(" -nv,  --no-version=<bool>             omit the framework version in the output\n");
-        std::printf(" -nc,  --no-colors=<bool>              disables colors in output\n");
-        std::printf(" -fc,  --force-colors=<bool>           use colors even when not in a tty\n");
-        std::printf(" -nb,  --no-breaks=<bool>              disables breakpoints in debuggers\n");
-        std::printf(" -ns,  --no-skip=<bool>                don't skip test cases marked as skip\n");
-        std::printf(" -npf, --no-path-filenames=<bool>      only filenames and no paths in output\n");
-        std::printf(" -nln, --no-line-numbers=<bool>        0 instead of real line numbers in output\n");
-        // ========================================================================================= << 79
-        // clang-format on
-
-        DOCTEST_PRINTF_COLORED("\n[doctest] ", Color::Cyan);
-        std::printf("for more information visit the project documentation\n\n");
-    }
-
-    void printSummary() {
-        const ContextState* p = contextState;
-
-        DOCTEST_PRINTF_COLORED(getSeparator(), Color::Yellow);
-        if(p->count || p->list_test_cases) {
-            DOCTEST_PRINTF_COLORED("[doctest] ", Color::Cyan);
-            std::printf("unskipped test cases passing the current filters: %u\n",
-                        p->numTestsPassingFilters);
-        } else if(p->list_test_suites) {
-            DOCTEST_PRINTF_COLORED("[doctest] ", Color::Cyan);
-            std::printf("unskipped test cases passing the current filters: %u\n",
-                        p->numTestsPassingFilters);
-            DOCTEST_PRINTF_COLORED("[doctest] ", Color::Cyan);
-            std::printf("test suites with unskipped test cases passing the current filters: %u\n",
-                        p->numTestSuitesPassingFilters);
-        } else {
-            const bool anythingFailed = p->numFailed > 0 || p->numFailedAssertions > 0;
-
-            char buff[DOCTEST_SNPRINTF_BUFFER_LENGTH];
-
-            DOCTEST_PRINTF_COLORED("[doctest] ", Color::Cyan);
-
-            DOCTEST_SNPRINTF(buff, DOCTEST_COUNTOF(buff), "test cases: %6u",
-                             p->numTestsPassingFilters);
-            DOCTEST_PRINTF_COLORED(buff, Color::None);
-            DOCTEST_SNPRINTF(buff, DOCTEST_COUNTOF(buff), " | ");
-            DOCTEST_PRINTF_COLORED(buff, Color::None);
-            DOCTEST_SNPRINTF(buff, DOCTEST_COUNTOF(buff), "%6d passed",
-                             p->numTestsPassingFilters - p->numFailed);
-            DOCTEST_PRINTF_COLORED(buff,
-                                   (p->numTestsPassingFilters == 0 || anythingFailed) ?
-                                           Color::None :
-                                           Color::Green);
-            DOCTEST_SNPRINTF(buff, DOCTEST_COUNTOF(buff), " | ");
-            DOCTEST_PRINTF_COLORED(buff, Color::None);
-            DOCTEST_SNPRINTF(buff, DOCTEST_COUNTOF(buff), "%6u failed", p->numFailed);
-            DOCTEST_PRINTF_COLORED(buff, p->numFailed > 0 ? Color::Red : Color::None);
-
-            DOCTEST_SNPRINTF(buff, DOCTEST_COUNTOF(buff), " | ");
-            DOCTEST_PRINTF_COLORED(buff, Color::None);
-            if(p->no_skipped_summary == false) {
-                const int numSkipped = static_cast<unsigned>(getRegisteredTests().size()) -
-                                       p->numTestsPassingFilters;
-                DOCTEST_SNPRINTF(buff, DOCTEST_COUNTOF(buff), "%6d skipped", numSkipped);
-                DOCTEST_PRINTF_COLORED(buff, numSkipped == 0 ? Color::None : Color::Yellow);
-            }
-            DOCTEST_PRINTF_COLORED("\n", Color::None);
-
-            DOCTEST_PRINTF_COLORED("[doctest] ", Color::Cyan);
-
-            DOCTEST_SNPRINTF(buff, DOCTEST_COUNTOF(buff), "assertions: %6d", p->numAssertions);
-            DOCTEST_PRINTF_COLORED(buff, Color::None);
-            DOCTEST_SNPRINTF(buff, DOCTEST_COUNTOF(buff), " | ");
-            DOCTEST_PRINTF_COLORED(buff, Color::None);
-            DOCTEST_SNPRINTF(buff, DOCTEST_COUNTOF(buff), "%6d passed",
-                             p->numAssertions - p->numFailedAssertions);
-            DOCTEST_PRINTF_COLORED(
-                    buff, (p->numAssertions == 0 || anythingFailed) ? Color::None : Color::Green);
-            DOCTEST_SNPRINTF(buff, DOCTEST_COUNTOF(buff), " | ");
-            DOCTEST_PRINTF_COLORED(buff, Color::None);
-            DOCTEST_SNPRINTF(buff, DOCTEST_COUNTOF(buff), "%6d failed", p->numFailedAssertions);
-            DOCTEST_PRINTF_COLORED(buff, p->numFailedAssertions > 0 ? Color::Red : Color::None);
-
-            DOCTEST_SNPRINTF(buff, DOCTEST_COUNTOF(buff), " |\n");
-            DOCTEST_PRINTF_COLORED(buff, Color::None);
-
-            DOCTEST_PRINTF_COLORED("[doctest] ", Color::Cyan);
-            DOCTEST_PRINTF_COLORED("Status: ", Color::None);
-            const char* result = (p->numFailed > 0) ? "FAILURE!\n" : "SUCCESS!\n";
-            DOCTEST_PRINTF_COLORED(result, p->numFailed > 0 ? Color::Red : Color::Green);
-        }
-
-        // remove any coloring
-        DOCTEST_PRINTF_COLORED("", Color::None);
-    }
-} // namespace detail
-
-bool isRunningInTest() { return detail::contextState != 0; }
-
-Context::Context(int argc, const char* const* argv)
-        : p(new detail::ContextState) {
-    parseArgs(argc, argv, true);
-}
-
-Context::~Context() { delete p; }
-
-void Context::applyCommandLine(int argc, const char* const* argv) { parseArgs(argc, argv); }
-
-// parses args
-void Context::parseArgs(int argc, const char* const* argv, bool withDefaults) {
-    using namespace detail;
-
-    // clang-format off
-    parseCommaSepArgs(argc, argv, "dt-source-file=",        p->filters[0]);
-    parseCommaSepArgs(argc, argv, "dt-sf=",                 p->filters[0]);
-    parseCommaSepArgs(argc, argv, "dt-source-file-exclude=",p->filters[1]);
-    parseCommaSepArgs(argc, argv, "dt-sfe=",                p->filters[1]);
-    parseCommaSepArgs(argc, argv, "dt-test-suite=",         p->filters[2]);
-    parseCommaSepArgs(argc, argv, "dt-ts=",                 p->filters[2]);
-    parseCommaSepArgs(argc, argv, "dt-test-suite-exclude=", p->filters[3]);
-    parseCommaSepArgs(argc, argv, "dt-tse=",                p->filters[3]);
-    parseCommaSepArgs(argc, argv, "dt-test-case=",          p->filters[4]);
-    parseCommaSepArgs(argc, argv, "dt-tc=",                 p->filters[4]);
-    parseCommaSepArgs(argc, argv, "dt-test-case-exclude=",  p->filters[5]);
-    parseCommaSepArgs(argc, argv, "dt-tce=",                p->filters[5]);
-    parseCommaSepArgs(argc, argv, "dt-subcase=",            p->filters[6]);
-    parseCommaSepArgs(argc, argv, "dt-sc=",                 p->filters[6]);
-    parseCommaSepArgs(argc, argv, "dt-subcase-exclude=",    p->filters[7]);
-    parseCommaSepArgs(argc, argv, "dt-sce=",                p->filters[7]);
-    // clang-format on
-
-    int    intRes = 0;
-    String strRes;
-
-#define DOCTEST_PARSE_AS_BOOL_OR_FLAG(name, sname, var, default)                                   \
-    if(parseIntOption(argc, argv, DOCTEST_STR_CONCAT_TOSTR(name, =), option_bool, intRes) ||       \
-       parseIntOption(argc, argv, DOCTEST_STR_CONCAT_TOSTR(sname, =), option_bool, intRes))        \
-        p->var = !!intRes;                                                                         \
-    else if(parseFlag(argc, argv, #name) || parseFlag(argc, argv, #sname))                         \
-        p->var = true;                                                                             \
-    else if(withDefaults)                                                                          \
-    p->var = default
-
-#define DOCTEST_PARSE_INT_OPTION(name, sname, var, default)                                        \
-    if(parseIntOption(argc, argv, DOCTEST_STR_CONCAT_TOSTR(name, =), option_int, intRes) ||        \
-       parseIntOption(argc, argv, DOCTEST_STR_CONCAT_TOSTR(sname, =), option_int, intRes))         \
-        p->var = intRes;                                                                           \
-    else if(withDefaults)                                                                          \
-    p->var = default
-
-#define DOCTEST_PARSE_STR_OPTION(name, sname, var, default)                                        \
-    if(parseOption(argc, argv, DOCTEST_STR_CONCAT_TOSTR(name, =), strRes, default) ||              \
-       parseOption(argc, argv, DOCTEST_STR_CONCAT_TOSTR(sname, =), strRes, default) ||             \
-       withDefaults)                                                                               \
-    p->var = strRes
-
-    // clang-format off
-    DOCTEST_PARSE_STR_OPTION(dt-order-by, dt-ob, order_by, "file");
-    DOCTEST_PARSE_INT_OPTION(dt-rand-seed, dt-rs, rand_seed, 0);
-
-    DOCTEST_PARSE_INT_OPTION(dt-first, dt-f, first, 1);
-    DOCTEST_PARSE_INT_OPTION(dt-last, dt-l, last, 0);
-
-    DOCTEST_PARSE_INT_OPTION(dt-abort-after, dt-aa, abort_after, 0);
-    DOCTEST_PARSE_INT_OPTION(dt-subcase-filter-levels, dt-scfl, subcase_filter_levels, 2000000000);
-
-    DOCTEST_PARSE_AS_BOOL_OR_FLAG(dt-success, dt-s, success, false);
-    DOCTEST_PARSE_AS_BOOL_OR_FLAG(dt-case-sensitive, dt-cs, case_sensitive, false);
-    DOCTEST_PARSE_AS_BOOL_OR_FLAG(dt-exit, dt-e, exit, false);
-    DOCTEST_PARSE_AS_BOOL_OR_FLAG(dt-duration, dt-d, duration, false);
-    DOCTEST_PARSE_AS_BOOL_OR_FLAG(dt-no-throw, dt-nt, no_throw, false);
-    DOCTEST_PARSE_AS_BOOL_OR_FLAG(dt-no-exitcode, dt-ne, no_exitcode, false);
-    DOCTEST_PARSE_AS_BOOL_OR_FLAG(dt-no-run, dt-nr, no_run, false);
-    DOCTEST_PARSE_AS_BOOL_OR_FLAG(dt-no-version, dt-nv, no_version, false);
-    DOCTEST_PARSE_AS_BOOL_OR_FLAG(dt-no-colors, dt-nc, no_colors, false);
-    DOCTEST_PARSE_AS_BOOL_OR_FLAG(dt-force-colors, dt-fc, force_colors, false);
-    DOCTEST_PARSE_AS_BOOL_OR_FLAG(dt-no-breaks, dt-nb, no_breaks, false);
-    DOCTEST_PARSE_AS_BOOL_OR_FLAG(dt-no-skip, dt-ns, no_skip, false);
-    DOCTEST_PARSE_AS_BOOL_OR_FLAG(dt-no-path-filenames, dt-npf, no_path_in_filenames, false);
-    DOCTEST_PARSE_AS_BOOL_OR_FLAG(dt-no-line-numbers, dt-nln, no_line_numbers, false);
-    DOCTEST_PARSE_AS_BOOL_OR_FLAG(dt-no-skipped-summary, dt-nss, no_skipped_summary, false);
-// clang-format on
-
-#undef DOCTEST_PARSE_STR_OPTION
-#undef DOCTEST_PARSE_INT_OPTION
-#undef DOCTEST_PARSE_AS_BOOL_OR_FLAG
-
-    if(withDefaults) {
-        p->help             = false;
-        p->version          = false;
-        p->count            = false;
-        p->list_test_cases  = false;
-        p->list_test_suites = false;
-    }
-    if(parseFlag(argc, argv, "dt-help") || parseFlag(argc, argv, "dt-h") ||
-       parseFlag(argc, argv, "dt-?")) {
-        p->help = true;
-        p->exit = true;
-    }
-    if(parseFlag(argc, argv, "dt-version") || parseFlag(argc, argv, "dt-v")) {
-        p->version = true;
-        p->exit    = true;
-    }
-    if(parseFlag(argc, argv, "dt-count") || parseFlag(argc, argv, "dt-c")) {
-        p->count = true;
-        p->exit  = true;
-    }
-    if(parseFlag(argc, argv, "dt-list-test-cases") || parseFlag(argc, argv, "dt-ltc")) {
-        p->list_test_cases = true;
-        p->exit            = true;
-    }
-    if(parseFlag(argc, argv, "dt-list-test-suites") || parseFlag(argc, argv, "dt-lts")) {
-        p->list_test_suites = true;
-        p->exit             = true;
-    }
-}
-
-// allows the user to add procedurally to the filters from the command line
-void Context::addFilter(const char* filter, const char* value) { setOption(filter, value); }
-
-// allows the user to clear all filters from the command line
-void Context::clearFilters() {
-    for(unsigned i = 0; i < p->filters.size(); ++i)
-        p->filters[i].clear();
-}
-
-// allows the user to override procedurally the int/bool options from the command line
-void Context::setOption(const char* option, int value) {
-    setOption(option, toString(value).c_str());
-}
-
-// allows the user to override procedurally the string options from the command line
-void Context::setOption(const char* option, const char* value) {
-    String      argv   = String("-") + option + "=" + value;
-    const char* lvalue = argv.c_str();
-    parseArgs(1, &lvalue);
-}
-
-// users should query this in their main() and exit the program if true
-bool Context::shouldExit() { return p->exit; }
-
-// the main function that does all the filtering and test running
-int Context::run() {
-    using namespace detail;
-
-    Color::init();
-
-    contextState = p;
-    p->resetRunData();
-
-    // handle version, help and no_run
-    if(p->no_run || p->version || p->help) {
-        if(p->version)
-            printVersion();
-        if(p->help)
-            printHelp();
-
-        contextState = 0;
-
-        return EXIT_SUCCESS;
-    }
-
-    printVersion();
-    DOCTEST_PRINTF_COLORED("[doctest] ", Color::Cyan);
-    std::printf("run with \"--help\" for options\n");
-
-    unsigned i = 0; // counter used for loops - here for VC6
-
-    std::set<TestCase>& registeredTests = getRegisteredTests();
-
-    std::vector<const TestCase*> testArray;
-    for(std::set<TestCase>::iterator it = registeredTests.begin(); it != registeredTests.end();
-        ++it)
-        testArray.push_back(&(*it));
-
-    // sort the collected records
-    if(!testArray.empty()) {
-        if(p->order_by.compare("file", true) == 0) {
-            std::qsort(&testArray[0], testArray.size(), sizeof(TestCase*), fileOrderComparator);
-        } else if(p->order_by.compare("suite", true) == 0) {
-            std::qsort(&testArray[0], testArray.size(), sizeof(TestCase*), suiteOrderComparator);
-        } else if(p->order_by.compare("name", true) == 0) {
-            std::qsort(&testArray[0], testArray.size(), sizeof(TestCase*), nameOrderComparator);
-        } else if(p->order_by.compare("rand", true) == 0) {
-            std::srand(p->rand_seed);
-
-            // random_shuffle implementation
-            const TestCase** first = &testArray[0];
-            for(i = testArray.size() - 1; i > 0; --i) {
-                int idxToSwap = std::rand() % (i + 1); // NOLINT
-
-                const TestCase* temp = first[i];
-
-                first[i]         = first[idxToSwap];
-                first[idxToSwap] = temp;
-            }
-        }
-    }
-
-    if(p->list_test_cases) {
-        DOCTEST_PRINTF_COLORED("[doctest] ", Color::Cyan);
-        std::printf("listing all test case names\n");
-        DOCTEST_PRINTF_COLORED(getSeparator(), Color::Yellow);
-    }
-
-    std::set<String> testSuitesPassingFilters;
-    if(p->list_test_suites) {
-        DOCTEST_PRINTF_COLORED("[doctest] ", Color::Cyan);
-        std::printf("listing all test suites\n");
-        DOCTEST_PRINTF_COLORED(getSeparator(), Color::Yellow);
-    }
-
-    // invoke the registered functions if they match the filter criteria (or just count them)
-    for(i = 0; i < testArray.size(); i++) {
-        const TestCase& data = *testArray[i];
-
-        if(data.m_skip && !p->no_skip)
-            continue;
-
-        if(!matchesAny(data.m_file, p->filters[0], 1, p->case_sensitive))
-            continue;
-        if(matchesAny(data.m_file, p->filters[1], 0, p->case_sensitive))
-            continue;
-        if(!matchesAny(data.m_test_suite, p->filters[2], 1, p->case_sensitive))
-            continue;
-        if(matchesAny(data.m_test_suite, p->filters[3], 0, p->case_sensitive))
-            continue;
-        if(!matchesAny(data.m_name, p->filters[4], 1, p->case_sensitive))
-            continue;
-        if(matchesAny(data.m_name, p->filters[5], 0, p->case_sensitive))
-            continue;
-
-        p->numTestsPassingFilters++;
-
-        // do not execute the test if we are to only count the number of filter passing tests
-        if(p->count)
-            continue;
-
-        // print the name of the test and don't execute it
-        if(p->list_test_cases) {
-            std::printf("%s\n", data.m_name);
-            continue;
-        }
-
-        // print the name of the test suite if not done already and don't execute it
-        if(p->list_test_suites) {
-            if((testSuitesPassingFilters.count(data.m_test_suite) == 0) &&
-               data.m_test_suite[0] != '\0') {
-                std::printf("%s\n", data.m_test_suite);
-                testSuitesPassingFilters.insert(data.m_test_suite);
-                p->numTestSuitesPassingFilters++;
-            }
-            continue;
-        }
-
-        // skip the test if it is not in the execution range
-        if((p->last < p->numTestsPassingFilters && p->first <= p->last) ||
-           (p->first > p->numTestsPassingFilters))
-            continue;
-
-        // execute the test if it passes all the filtering
-        {
-            p->currentTest = &data;
-
-            bool failed                              = false;
-            p->hasLoggedCurrentTestStart             = false;
-            p->numFailedAssertionsForCurrentTestcase = 0;
-            p->subcasesPassed.clear();
-            double duration = 0;
-            Timer  timer;
-            timer.start();
-            do {
-                // if the start has been logged from a previous iteration of this loop
-                if(p->hasLoggedCurrentTestStart)
-                    logTestEnd();
-                p->hasLoggedCurrentTestStart = false;
-
-                // if logging successful tests - force the start log
-                if(p->success)
-                    DOCTEST_LOG_START();
-
-                // reset the assertion state
-                p->numAssertionsForCurrentTestcase = 0;
-                p->hasCurrentTestFailed            = false;
-
-                // reset some of the fields for subcases (except for the set of fully passed ones)
-                p->subcasesHasSkipped   = false;
-                p->subcasesCurrentLevel = 0;
-                p->subcasesEnteredLevels.clear();
-
-                // reset stuff for logging with INFO()
-                p->exceptionalContexts.clear();
-
-// execute the test
-#ifndef DOCTEST_CONFIG_NO_EXCEPTIONS
-                try {
-#endif // DOCTEST_CONFIG_NO_EXCEPTIONS
-                    FatalConditionHandler fatalConditionHandler; // Handle signals
-                    data.m_test();
-                    fatalConditionHandler.reset();
-                    if(contextState->hasCurrentTestFailed)
-                        failed = true;
-#ifndef DOCTEST_CONFIG_NO_EXCEPTIONS
-                } catch(const TestFailureException&) { failed = true; } catch(...) {
-                    DOCTEST_LOG_START();
-                    logTestException(translateActiveException());
-                    failed = true;
-                }
-#endif // DOCTEST_CONFIG_NO_EXCEPTIONS
-
-                p->numAssertions += p->numAssertionsForCurrentTestcase;
-
-                // exit this loop if enough assertions have failed
-                if(p->abort_after > 0 && p->numFailedAssertions >= p->abort_after) {
-                    p->subcasesHasSkipped = false;
-                    DOCTEST_PRINTF_COLORED("Aborting - too many failed asserts!\n", Color::Red);
-                }
-
-            } while(p->subcasesHasSkipped == true);
-
-            duration = timer.getElapsedSeconds();
-
-            if(Approx(p->currentTest->m_timeout).epsilon(DBL_EPSILON) != 0 &&
-               Approx(duration).epsilon(DBL_EPSILON) > p->currentTest->m_timeout) {
-                failed = true;
-                DOCTEST_LOG_START();
-                char msg[DOCTEST_SNPRINTF_BUFFER_LENGTH];
-                DOCTEST_SNPRINTF(msg, DOCTEST_COUNTOF(msg),
-                                 "Test case exceeded time limit of %.6f!\n",
-                                 p->currentTest->m_timeout);
-                DOCTEST_PRINTF_COLORED(msg, Color::Red);
-            }
-
-            if(p->duration) {
-                char msg[DOCTEST_SNPRINTF_BUFFER_LENGTH];
-                DOCTEST_SNPRINTF(msg, DOCTEST_COUNTOF(msg), "%.6f s: %s\n", duration,
-                                 p->currentTest->m_name);
-                DOCTEST_PRINTF_COLORED(msg, Color::None);
-            }
-
-            if(data.m_should_fail) {
-                DOCTEST_LOG_START();
-                if(failed) {
-                    failed = false;
-                    DOCTEST_PRINTF_COLORED("Failed as expected so marking it as not failed\n",
-                                           Color::Yellow);
-                } else {
-                    failed = true;
-                    DOCTEST_PRINTF_COLORED("Should have failed but didn't! Marking it as failed!\n",
-                                           Color::Red);
-                }
-            } else if(failed && data.m_may_fail) {
-                DOCTEST_LOG_START();
-                failed = false;
-                DOCTEST_PRINTF_COLORED("Allowed to fail so marking it as not failed\n",
-                                       Color::Yellow);
-            } else if(data.m_expected_failures > 0) {
-                DOCTEST_LOG_START();
-                char msg[DOCTEST_SNPRINTF_BUFFER_LENGTH];
-                if(p->numFailedAssertionsForCurrentTestcase == data.m_expected_failures) {
-                    failed = false;
-                    DOCTEST_SNPRINTF(
-                            msg, DOCTEST_COUNTOF(msg),
-                            "Failed exactly %d times as expected so marking it as not failed!\n",
-                            data.m_expected_failures);
-                    DOCTEST_PRINTF_COLORED(msg, Color::Yellow);
-                } else {
-                    failed = true;
-                    DOCTEST_SNPRINTF(msg, DOCTEST_COUNTOF(msg),
-                                     "Didn't fail exactly %d times so marking it as failed!\n",
-                                     data.m_expected_failures);
-                    DOCTEST_PRINTF_COLORED(msg, Color::Red);
-                }
-            }
-
-            if(p->hasLoggedCurrentTestStart)
-                logTestEnd();
-
-            if(failed) // if any subcase has failed - the whole test case has failed
-                p->numFailed++;
-
-            // stop executing tests if enough assertions have failed
-            if(p->abort_after > 0 && p->numFailedAssertions >= p->abort_after)
-                break;
-        }
-    }
-
-    printSummary();
-
-    contextState = 0;
-
-    if(p->numFailed && !p->no_exitcode)
-        return EXIT_FAILURE;
-    return EXIT_SUCCESS;
-}
-} // namespace doctest
-
-#endif // DOCTEST_CONFIG_DISABLE
-
-#ifdef DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
-int main(int argc, char** argv) { return doctest::Context(argc, argv).run(); }
-#endif // DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
-
-#endif // DOCTEST_LIBRARY_IMPLEMENTATION
-#endif // DOCTEST_CONFIG_IMPLEMENT
-
-#if defined(__clang__)
-#pragma clang diagnostic pop
-#endif // __clang__
-
-#if defined(__GNUC__) && !defined(__clang__)
-#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 6)
-#pragma GCC diagnostic pop
-#endif // > gcc 4.6
-#endif // __GNUC__
-
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif // _MSC_VER
diff --git a/src/unittests/endian.cc b/src/unittests/endian.cc
deleted file mode 100644
index ef03a1c2d..000000000
--- a/src/unittests/endian.cc
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2013-2017  The ManaPlus Developers
- *
- *  This file is part of The ManaPlus Client.
- *
- *  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
- *  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, see <http://www.gnu.org/licenses/>.
- */
-
-#include "unittests/unittests.h"
-
-#include "logger.h"
-
-PRAGMA48(GCC diagnostic push)
-PRAGMA48(GCC diagnostic ignored "-Wshadow")
-#include <SDL_endian.h>
-PRAGMA48(GCC diagnostic pop)
-
-#include "debug.h"
-
-#ifndef SDL_BIG_ENDIAN
-#error missing SDL_endian.h
-#endif  // SDL_BYTEORDER
-
-namespace
-{
-    union ByteOrderData final
-    {
-        uint32_t dwordData;
-        uint8_t byteData[4];
-    } __attribute__((packed));
-}  // namespace
-
-TEST_CASE("endian test", "")
-{
-    ByteOrderData data;
-    data.byteData[0] = 0x10;
-    data.byteData[1] = 0x20;
-    data.byteData[2] = 0x30;
-    data.byteData[3] = 0x40;
-#if SDL_BYTEORDER == SDL_BIG_ENDIAN
-    REQUIRE(data.dwordData == 0x10203040);
-    logger->log("big endian detected");
-#else  // SDL_BYTEORDER == SDL_BIG_ENDIAN
-
-    REQUIRE(data.dwordData == 0x40302010);
-    logger->log("little endian detected");
-#endif  // SDL_BYTEORDER == SDL_BIG_ENDIAN
-}
diff --git a/src/unittests/enums/enums.cc b/src/unittests/enums/enums.cc
deleted file mode 100644
index ebff849d9..000000000
--- a/src/unittests/enums/enums.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2015-2017  The ManaPlus Developers
- *
- *  This file is part of The ManaPlus Client.
- *
- *  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
- *  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, see <http://www.gnu.org/licenses/>.
- */
-
-#include "unittests/unittests.h"
-
-#include "enums/being/gender.h"
-
-#include "utils/cast.h"
-
-#include "debug.h"
-
-TEST_CASE("Gender", "Enums")
-{
-    REQUIRE(CAST_S32(Gender::FEMALE) == 1);
-    REQUIRE(Gender::FEMALE == static_cast<GenderT>(1));
-    REQUIRE(CAST_S32(Gender::MALE) == 0);
-    REQUIRE(Gender::MALE == static_cast<GenderT>(0));
-}
diff --git a/src/unittests/enums/render/mockdrawtype.h b/src/unittests/enums/render/mockdrawtype.h
deleted file mode 100644
index 7477684d0..000000000
--- a/src/unittests/enums/render/mockdrawtype.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2017  The ManaPlus Developers
- *
- *  This file is part of The ManaPlus Client.
- *
- *  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
- *  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, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef ENUMS_RENDER_MOCKDRAWTYPE_H
-#define ENUMS_RENDER_MOCKDRAWTYPE_H
-#ifdef UNITTESTS
-
-#include "enums/simpletypes/enumdefines.h"
-
-enumStart(MockDrawType)
-{
-    DrawImage   = 0,
-    DrawPattern = 1
-}
-enumEnd(MockDrawType);
-
-#endif  // UNITTESTS
-#endif  // ENUMS_RENDER_MOCKDRAWTYPE_H
diff --git a/src/unittests/fs/files.cc b/src/unittests/fs/files.cc
deleted file mode 100644
index 935a00f72..000000000
--- a/src/unittests/fs/files.cc
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2013-2017  The ManaPlus Developers
- *
- *  This file is part of The ManaPlus Client.
- *
- *  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
- *  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, see <http://www.gnu.org/licenses/>.
- */
-
-#include "unittests/unittests.h"
-
-
-#include "fs/files.h"
-
-#include "fs/virtfs/fs.h"
-#include "fs/virtfs/tools.h"
-
-#include "utils/stringutils.h"
-
-#include "resources/resourcemanager/resourcemanager.h"
-
-#include "debug.h"
-
-TEST_CASE("Files renameFile", "")
-{
-    VirtFs::mountDirSilent("data", Append_false);
-    VirtFs::mountDirSilent("../data", Append_false);
-
-    const int sz = 1234567;
-    char *buf = new char[sz];
-    for (int f = 0; f < sz; f ++)
-        buf[f] = f;
-
-    const std::string name1 = "file1.test";
-    const std::string name2 = "file2.test";
-    FILE *file = fopen(name1.c_str(), "w+b");
-    fwrite(buf, 1, sz, file);
-    fclose(file);
-
-    REQUIRE(0 == Files::renameFile(name1, name2));
-    char *buf2 = new char[sz];
-    FILE *file2 = fopen(name2.c_str(), "rb");
-    REQUIRE_FALSE(nullptr == file2);
-    fread(buf2, 1, sz, file2);
-    fclose(file2);
-    ::remove(name1.c_str());
-    ::remove(name2.c_str());
-
-    for (int f = 0; f < sz; f ++)
-        REQUIRE(buf[f] == buf2[f]);
-
-    delete [] buf;
-    delete [] buf2;
-    ResourceManager::deleteInstance();
-    VirtFs::unmountDirSilent("data");
-    VirtFs::unmountDirSilent("../data");
-}
-
-TEST_CASE("Files existsLocal", "")
-{
-    VirtFs::mountDirSilent("data", Append_false);
-    VirtFs::mountDirSilent("../data", Append_false);
-    REQUIRE(Files::existsLocal(VirtFs::getPath("help/about.txt")) == true);
-    REQUIRE_FALSE(Files::existsLocal(VirtFs::getPath("help/about1.txt")));
-    REQUIRE_FALSE(Files::existsLocal(VirtFs::getPath("help1/about.txt")));
-    ResourceManager::deleteInstance();
-    VirtFs::unmountDirSilent("data");
-    VirtFs::unmountDirSilent("../data");
-}
-
-TEST_CASE("Files loadTextFileString", "")
-{
-    VirtFs::mountDirSilent("data", Append_false);
-    VirtFs::mountDirSilent("../data", Append_false);
-    REQUIRE(VirtFs::loadTextFileString("test/simplefile.txt") ==
-        "this is test \nfile.");
-    ResourceManager::deleteInstance();
-    VirtFs::unmountDirSilent("data");
-    VirtFs::unmountDirSilent("../data");
-}
-
-TEST_CASE("Files loadTextFile", "")
-{
-    VirtFs::mountDirSilent("data", Append_false);
-    VirtFs::mountDirSilent("../data", Append_false);
-
-    StringVect lines;
-    VirtFs::loadTextFile("test/simplefile.txt", lines);
-    REQUIRE(lines.size() == 2);
-    REQUIRE(lines[0] == "this is test ");
-    REQUIRE(lines[1] == "file.");
-    ResourceManager::deleteInstance();
-    VirtFs::unmountDirSilent("data");
-    VirtFs::unmountDirSilent("../data");
-}
-
-TEST_CASE("Files saveTextFile", "")
-{
-    VirtFs::mountDirSilent("data", Append_false);
-    VirtFs::mountDirSilent("../data", Append_false);
-
-    const std::string dir = VirtFs::getPath("test");
-    REQUIRE(!dir.empty());
-    Files::saveTextFile(dir, "tempfile.txt", "test line\ntext line2");
-    std::string data = VirtFs::loadTextFileString("test/tempfile.txt");
-    ::remove((dir + "/tempfile.txt").c_str());
-#ifdef WIN32
-    REQUIRE(data == "test line\r\ntext line2\r\n");
-#else  // WIN32
-
-    REQUIRE(data == "test line\ntext line2\n");
-#endif  // WIN32
-
-    ResourceManager::deleteInstance();
-    VirtFs::unmountDirSilent("data");
-    VirtFs::unmountDirSilent("../data");
-}
-
-TEST_CASE("Files copyFile1", "")
-{
-    VirtFs::mountDirSilent("data", Append_false);
-    VirtFs::mountDirSilent("../data", Append_false);
-
-    const std::string dir = VirtFs::getPath("test");
-    REQUIRE(!dir.empty());
-    SECTION("copy")
-    {
-        REQUIRE(Files::copyFile(pathJoin(dir, "test.txt"),
-            pathJoin(dir, "tempfile.txt")) == 0);
-        std::string data = VirtFs::loadTextFileString("test/tempfile.txt");
-        ::remove((dir + "/tempfile.txt").c_str());
-        REQUIRE(data == "test line 1\ntest line 2");
-    }
-
-    SECTION("errors")
-    {
-        REQUIRE(Files::copyFile(pathJoin(dir, "test_not_exists.txt"),
-            pathJoin(dir, "tempfile.txt")) == -1);
-        REQUIRE(Files::copyFile(pathJoin(dir, "test.txt"),
-            "/nonexist/root/dir123") == -1);
-    }
-
-    ResourceManager::deleteInstance();
-    VirtFs::unmountDirSilent("data");
-    VirtFs::unmountDirSilent("../data");
-}
-
-TEST_CASE("Files loadTextFileLocal", "")
-{
-    VirtFs::mountDirSilent("data", Append_false);
-    VirtFs::mountDirSilent("../data", Append_false);
-
-    const std::string dir = VirtFs::getPath("test");
-    REQUIRE(!dir.empty());
-    Files::saveTextFile(dir, "tempfile.txt", "test line\ntext line2");
-    StringVect lines;
-    REQUIRE(Files::loadTextFileLocal(pathJoin(dir, "tempfile.txt"),
-        lines));
-    ::remove((dir + "/tempfile.txt").c_str());
-    REQUIRE(lines.size() == 2);
-    REQUIRE(lines[0] == "test line");
-    REQUIRE(lines[1] == "text line2");
-
-    ResourceManager::deleteInstance();
-    VirtFs::unmountDirSilent("data");
-    VirtFs::unmountDirSilent("../data");
-}
-
-TEST_CASE("Files getFilesInDir", "")
-{
-    VirtFs::mountDirSilent("data", Append_false);
-    VirtFs::mountDirSilent("../data", Append_false);
-
-    StringVect list;
-    VirtFs::getFilesInDir("test",
-        list,
-        ".gpl");
-    REQUIRE(list.size() == 1);
-    REQUIRE(list[0] == pathJoin("test", "palette.gpl"));
-
-    list.clear();
-    VirtFs::getFilesInDir("perserver/default",
-        list,
-        ".xml");
-    REQUIRE(list.size() == 6);
-    REQUIRE(list[0] == pathJoin("perserver", "default", "charcreation.xml"));
-    REQUIRE(list[1] == pathJoin("perserver", "default", "deadmessages.xml"));
-    REQUIRE(list[2] ==
-        pathJoin("perserver", "default", "defaultcommands.xml"));
-    REQUIRE(list[3] == pathJoin("perserver", "default", "features.xml"));
-    REQUIRE(list[4] == pathJoin("perserver", "default", "groups.xml"));
-    REQUIRE(list[5] == pathJoin("perserver", "default", "weapons.xml"));
-    ResourceManager::deleteInstance();
-    VirtFs::unmountDirSilent("data");
-    VirtFs::unmountDirSilent("../data");
-}
diff --git a/src/unittests/fs/virtfs/throw.cc b/src/unittests/fs/virtfs/throw.cc
deleted file mode 100644
index 9f0a18f32..000000000
--- a/src/unittests/fs/virtfs/throw.cc
+++ /dev/null
@@ -1,225 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2016-2017  The ManaPlus Developers
- *
- *  This file is part of The ManaPlus Client.
- *
- *  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
- *  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, see <http://www.gnu.org/licenses/>.
- */
-
-#include "unittests/unittests.h"
-
-#include "configmanager.h"
-#include "configuration.h"
-#include "dirs.h"
-
-#include "fs/virtfs/fs.h"
-#include "fs/virtfs/zipreader.h"
-
-#include "utils/checkutils.h"
-
-#ifndef UNITTESTS_CATCH
-#include <algorithm>
-#endif  // UNITTESTS_CATCH
-
-#include "debug.h"
-
-TEST_CASE("throw VirtFs1 exists1", "")
-{
-    VirtFs::init(".");
-    const bool dir1 = VirtFs::mountDirSilent("data/",
-        Append_false);
-    VirtFs::mountDirSilent("..\\data",
-        Append_false);
-
-    if (dir1 == true)
-    {
-        VirtFs::mountDir("data//test",
-            Append_false);
-    }
-    else
-    {
-        VirtFs::mountDirSilent("..//data\\test",
-            Append_false);
-    }
-
-    if (dir1 == true)
-        VirtFs::unmountDirSilent("data/test");
-    else
-        VirtFs::unmountDirSilent("../data/test");
-
-    REQUIRE_THROWS(VirtFs::exists("test/../units.xml"));
-
-    VirtFs::deinit();
-}
-
-TEST_CASE("throw VirtFs1 exists2", "")
-{
-    VirtFs::init(".");
-    const bool dir1 = VirtFs::mountDirSilent2("data/",
-        "test",
-        Append_false);
-    VirtFs::mountDirSilent2("..\\data",
-        "test",
-        Append_false);
-
-    if (dir1 == true)
-    {
-        VirtFs::mountDir2("data//test",
-            "dir2",
-            Append_false);
-    }
-    else
-    {
-        VirtFs::mountDirSilent2("..//data\\test",
-            "dir2",
-            Append_false);
-    }
-
-    if (dir1 == true)
-        VirtFs::unmountDirSilent2("data/test", "dir2");
-    else
-        VirtFs::unmountDirSilent2("../data/test", "dir2");
-
-    REQUIRE_THROWS(VirtFs::exists("test/../units.xml"));
-
-    VirtFs::deinit();
-}
-
-TEST_CASE("throw Zip readCompressedFile", "")
-{
-    SECTION("empty")
-    {
-        REQUIRE_THROWS(VirtFs::ZipReader::readCompressedFile(nullptr));
-    }
-}
-
-TEST_CASE("throw Zip readFile", "")
-{
-    SECTION("empty")
-    {
-        REQUIRE_THROWS(VirtFs::ZipReader::readFile(nullptr));
-    }
-}
-
-TEST_CASE("throw VirtFs1 unmount", "")
-{
-    VirtFs::init(".");
-    const std::string sep = dirSeparator;
-
-    SECTION("simple 1")
-    {
-        REQUIRE_THROWS(VirtFs::unmountDir("dir1"));
-        REQUIRE_THROWS(VirtFs::unmountDir("dir1/"));
-    }
-
-    SECTION("simple 2")
-    {
-        REQUIRE(VirtFs::mountDirSilentTest("dir1",
-            Append_true));
-        REQUIRE_THROWS(VirtFs::unmountDir("dir2"));
-        REQUIRE(VirtFs::unmountDir("dir1"));
-    }
-
-    SECTION("simple 3")
-    {
-        REQUIRE(VirtFs::mountDirSilentTest("dir1",
-            Append_true));
-        REQUIRE(VirtFs::mountDirSilentTest("dir2//dir3",
-            Append_true));
-        REQUIRE(VirtFs::mountDirSilentTest("dir3",
-            Append_false));
-        REQUIRE_THROWS(VirtFs::unmountDir("dir2"));
-        REQUIRE(VirtFs::unmountDir("dir1"));
-        REQUIRE_THROWS(VirtFs::unmountDir("dir1"));
-        REQUIRE(VirtFs::unmountDir("dir2/dir3"));
-        REQUIRE_THROWS(VirtFs::unmountDir("dir2/dir3" + sep));
-    }
-
-    SECTION("simple 4")
-    {
-        REQUIRE(VirtFs::mountDirSilentTest("dir1",
-            Append_true));
-        REQUIRE_THROWS(VirtFs::unmountDir("dir2"));
-        REQUIRE(VirtFs::unmountDir("dir1"));
-        REQUIRE(VirtFs::mountDirSilentTest("dir1",
-            Append_true));
-    }
-
-    SECTION("subDir 1")
-    {
-        REQUIRE_THROWS(VirtFs::unmountDir2("dir1", "dir1"));
-        REQUIRE_THROWS(VirtFs::unmountDir2("dir1/", "dir1/"));
-    }
-
-    SECTION("subDir 2")
-    {
-        REQUIRE(VirtFs::mountDirSilentTest2("dir1",
-            "dir2",
-            Append_true));
-        REQUIRE_THROWS(VirtFs::unmountDir("dir1"));
-        REQUIRE_THROWS(VirtFs::unmountDir("dir2"));
-        REQUIRE(VirtFs::unmountDir2("dir1", "dir2"));
-    }
-
-    SECTION("subDir 3")
-    {
-        REQUIRE(VirtFs::mountDirSilentTest2("dir1",
-            "dir2",
-            Append_true));
-        REQUIRE(VirtFs::mountDirSilentTest("dir2//dir3",
-            Append_true));
-        REQUIRE(VirtFs::mountDirSilentTest2("dir3",
-            "dir4",
-            Append_false));
-        REQUIRE_THROWS(VirtFs::unmountDir("dir2"));
-        REQUIRE_THROWS(VirtFs::unmountDir2("dir1", "dir1"));
-        REQUIRE(VirtFs::unmountDir2("dir1", "dir2"));
-        REQUIRE_THROWS(VirtFs::unmountDir("dir1"));
-        REQUIRE(VirtFs::unmountDir("dir2/dir3"));
-        REQUIRE_THROWS(VirtFs::unmountDir("dir2/dir3" + sep));
-    }
-
-    SECTION("subDir 4")
-    {
-        REQUIRE(VirtFs::mountDirSilentTest2("dir1",
-            "dir2",
-            Append_true));
-        REQUIRE_THROWS(VirtFs::unmountDir("dir2"));
-        REQUIRE_THROWS(VirtFs::unmountDir("dir1"));
-        REQUIRE(VirtFs::unmountDir2("dir1", "dir2"));
-        REQUIRE(VirtFs::mountDirSilentTest2("dir1",
-            "dir3",
-            Append_true));
-    }
-
-    VirtFs::deinit();
-}
-
-TEST_CASE("throw configuration tests", "configuration")
-{
-    Dirs::initRootDir();
-    Dirs::initHomeDir();
-
-    ConfigManager::initConfiguration();
-
-    SECTION("configuration undefined")
-    {
-        const char *const key = "nonsetvalue";
-        REQUIRE_THROWS(config.getIntValue(key));
-        REQUIRE_THROWS(config.getFloatValue(key));
-        REQUIRE_THROWS(config.getStringValue(key));
-        REQUIRE_THROWS(config.getBoolValue(key));
-    }
-}
diff --git a/src/unittests/fs/virtfs/virtfs.cc b/src/unittests/fs/virtfs/virtfs.cc
deleted file mode 100644
index 64f93c8f4..000000000
--- a/src/unittests/fs/virtfs/virtfs.cc
+++ /dev/null
@@ -1,996 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2016-2017  The ManaPlus Developers
- *
- *  This file is part of The ManaPlus Client.
- *
- *  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
- *  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, see <http://www.gnu.org/licenses/>.
- */
-
-#include "unittests/unittests.h"
-
-#include "fs/files.h"
-#include "fs/paths.h"
-
-#include "fs/virtfs/fs.h"
-#include "fs/virtfs/list.h"
-
-#include "utils/checkutils.h"
-#include "utils/foreach.h"
-
-#ifndef UNITTESTS_CATCH
-#include <algorithm>
-#endif  // UNITTESTS_CATCH
-
-#include "debug.h"
-
-TEST_CASE("VirtFs dirSeparator", "")
-{
-    REQUIRE(dirSeparator != nullptr);
-    REQUIRE(VirtFs::getDirSeparator() == std::string(dirSeparator));
-    VirtFs::updateDirSeparator();
-    REQUIRE(dirSeparator != nullptr);
-    REQUIRE(VirtFs::getDirSeparator() == std::string(dirSeparator));
-}
-
-TEST_CASE("VirtFs getBaseDir", "")
-{
-    REQUIRE(VirtFs::getBaseDir() != nullptr);
-}
-
-TEST_CASE("VirtFs getUserDir", "")
-{
-    REQUIRE(VirtFs::getUserDir() != nullptr);
-}
-
-TEST_CASE("VirtFs exists1", "")
-{
-    VirtFs::mountDirSilent("data", Append_false);
-    VirtFs::mountDirSilent("../data", Append_false);
-
-    REQUIRE(VirtFs::exists("test") == true);
-    REQUIRE(VirtFs::exists("test/dir1") == true);
-    REQUIRE(VirtFs::exists("test/dir") == false);
-    REQUIRE(VirtFs::exists("test/units.xml") == true);
-    REQUIRE(VirtFs::exists("test/units123.xml") == false);
-    REQUIRE(VirtFs::exists("tesQ/units.xml") == false);
-    REQUIRE(VirtFs::exists("units.xml") == false);
-
-    VirtFs::mountDirSilent("data/test", Append_false);
-    VirtFs::mountDirSilent("../data/test", Append_false);
-
-    REQUIRE(VirtFs::exists("test") == true);
-    REQUIRE(VirtFs::exists("test/dir1") == true);
-    REQUIRE(VirtFs::exists("test/dir") == false);
-    REQUIRE(VirtFs::exists("test/units.xml") == true);
-    REQUIRE(VirtFs::exists("test/units123.xml") == false);
-    REQUIRE(VirtFs::exists("tesQ/units.xml") == false);
-    REQUIRE(VirtFs::exists("units.xml") == true);
-
-    VirtFs::unmountDirSilent("data/test");
-    VirtFs::unmountDirSilent("../data/test");
-
-    REQUIRE(VirtFs::exists("test") == true);
-    REQUIRE(VirtFs::exists("test/dir1") == true);
-    REQUIRE(VirtFs::exists("test/dir") == false);
-    REQUIRE(VirtFs::exists("test/units.xml") == true);
-    REQUIRE(VirtFs::exists("test/units123.xml") == false);
-    REQUIRE(VirtFs::exists("tesQ/units.xml") == false);
-    REQUIRE(VirtFs::exists("units.xml") == false);
-
-    VirtFs::unmountDirSilent("data");
-    VirtFs::unmountDirSilent("../data");
-}
-
-TEST_CASE("VirtFs exists2", "")
-{
-    std::string name("data/test/test.zip");
-    std::string prefix;
-    if (Files::existsLocal(name) == false)
-        prefix = "../" + prefix;
-
-    VirtFs::mountZip(prefix + "data/test/test2.zip", Append_false);
-
-    REQUIRE(VirtFs::exists("test") == false);
-    REQUIRE(VirtFs::exists("test/units.xml") == false);
-    REQUIRE(VirtFs::exists("test.txt") == true);
-    REQUIRE(VirtFs::exists("dir/hide.png") == true);
-    REQUIRE(VirtFs::exists("dir/gpl") == true);
-    REQUIRE(VirtFs::exists("dir/gpl/zzz") == false);
-    REQUIRE(VirtFs::exists("units.xml") == true);
-    REQUIRE(VirtFs::exists("units.xml.") == false);
-    REQUIRE(VirtFs::exists("units.xml2") == false);
-
-    VirtFs::unmountZip(prefix + "data/test/test2.zip");
-}
-
-TEST_CASE("VirtFs exists3", "")
-{
-    std::string name("data/test/test.zip");
-    std::string prefix;
-    if (Files::existsLocal(name) == false)
-        prefix = "../" + prefix;
-
-    VirtFs::mountZip(prefix + "data/test/test.zip", Append_false);
-    VirtFs::mountZip(prefix + "data/test/test2.zip", Append_false);
-
-    REQUIRE(VirtFs::exists("test") == false);
-    REQUIRE(VirtFs::exists("test/units.xml") == false);
-    REQUIRE(VirtFs::exists("dir/brimmedhat.png"));
-    REQUIRE(VirtFs::exists("dir//brimmedhat.png"));
-    REQUIRE(VirtFs::exists("dir//hide.png"));
-    REQUIRE(VirtFs::exists("dir/1"));
-    REQUIRE(VirtFs::exists("dir/gpl"));
-    REQUIRE(VirtFs::exists("dir/dye.png"));
-    REQUIRE(VirtFs::exists("dir/2") == false);
-    REQUIRE(VirtFs::exists("dir2/2") == false);
-    REQUIRE(VirtFs::exists("dir2/paths.xml"));
-
-    VirtFs::unmountZip(prefix + "data/test/test.zip");
-    VirtFs::unmountZip(prefix + "data/test/test2.zip");
-}
-
-TEST_CASE("VirtFs exists4", "")
-{
-    std::string name("data/test/test.zip");
-    std::string prefix;
-    if (Files::existsLocal(name) == false)
-        prefix = "../" + prefix;
-
-    VirtFs::mountZip(prefix + "data/test/test.zip", Append_false);
-    VirtFs::mountDirSilent(prefix + "data/test", Append_false);
-
-    REQUIRE(VirtFs::exists("test") == false);
-    REQUIRE(VirtFs::exists("test/units.xml") == false);
-    REQUIRE(VirtFs::exists("dir/brimmedhat.png"));
-    REQUIRE(VirtFs::exists("dir//brimmedhat.png"));
-    REQUIRE(VirtFs::exists("dir//hide.png"));
-    REQUIRE(VirtFs::exists("dir/1") == false);
-    REQUIRE(VirtFs::exists("dir/gpl") == false);
-    REQUIRE(VirtFs::exists("dir/dye.png") == false);
-    REQUIRE(VirtFs::exists("dir/2") == false);
-    REQUIRE(VirtFs::exists("dir2/2") == false);
-    REQUIRE(VirtFs::exists("dir2/paths.xml") == false);
-    REQUIRE(VirtFs::exists("units.xml"));
-    REQUIRE(VirtFs::exists("dir1/file1.txt"));
-    REQUIRE(VirtFs::exists("dir2/file2.txt"));
-    REQUIRE(VirtFs::exists("dir2/file3.txt") == false);
-
-    VirtFs::unmountZip(prefix + "data/test/test.zip");
-    VirtFs::unmountDirSilent(prefix + "data/test");
-}
-
-TEST_CASE("VirtFs exists5", "")
-{
-    std::string name("data/test/test.zip");
-    std::string prefix;
-    if (Files::existsLocal(name) == false)
-        prefix = "../" + prefix;
-
-    const std::string realDir = getRealPath(prefix + "data");
-    logger->log("real dir: " + realDir);
-    REQUIRE_FALSE(VirtFs::exists(realDir));
-}
-
-TEST_CASE("VirtFs exists6", "")
-{
-    std::string name("data/test/test.zip");
-    std::string prefix;
-    if (Files::existsLocal(name) == false)
-        prefix = "../" + prefix;
-
-    VirtFs::mountZip2(prefix + "data/test/test2.zip",
-        "dir",
-        Append_false);
-
-    REQUIRE(VirtFs::exists("test") == false);
-    REQUIRE(VirtFs::exists("test/units.xml") == false);
-    REQUIRE(VirtFs::exists("test.txt") == false);
-    REQUIRE(VirtFs::exists("dir/hide.png") == false);
-    REQUIRE(VirtFs::exists("dir/gpl") == false);
-    REQUIRE(VirtFs::exists("dir/gpl/zzz") == false);
-    REQUIRE(VirtFs::exists("units.xml") == false);
-    REQUIRE(VirtFs::exists("units.xml.") == false);
-    REQUIRE(VirtFs::exists("units.xml2") == false);
-    REQUIRE(VirtFs::exists("hide.png"));
-    REQUIRE(VirtFs::exists("dye.png"));
-    REQUIRE(VirtFs::exists("gpl"));
-    REQUIRE(VirtFs::exists("gpl/zzz") == false);
-
-    VirtFs::unmountZip2(prefix + "data/test/test2.zip",
-        "dir");
-}
-
-static void removeTemp(StringVect &restrict list)
-{
-    int cnt = 0;
-    std::sort(list.begin(), list.end());
-
-    FOR_EACH (StringVectIter, it, list)
-    {
-        if (*it != "serverlistplus.xml.part")
-        {
-            logger->log("file: %d %s",
-                cnt,
-                (*it).c_str());
-            cnt ++;
-        }
-    }
-
-    FOR_EACH (StringVectIter, it, list)
-    {
-        if (*it == "serverlistplus.xml.part")
-        {
-            list.erase(it);
-            return;
-        }
-    }
-}
-
-static bool inList(const VirtFs::List *const list,
-                   const std::string &name)
-{
-    FOR_EACH (StringVectCIter, it, list->names)
-    {
-        if (*it == name)
-            return true;
-    }
-    return false;
-}
-
-TEST_CASE("VirtFs enumerateFiles1", "")
-{
-    VirtFs::mountDirSilent("data", Append_false);
-    VirtFs::mountDirSilent("../data", Append_false);
-
-    VirtFs::List *list = nullptr;
-
-    const int cnt1 = VirtFs::exists("test/test2.txt") ? 28 : 27;
-    const int cnt2 = 28;
-
-    VirtFs::permitLinks(false);
-    list = VirtFs::enumerateFiles("test");
-    removeTemp(list->names);
-    const size_t sz = list->names.size();
-    REQUIRE(sz == cnt1);
-    VirtFs::freeList(list);
-
-    VirtFs::permitLinks(true);
-    list = VirtFs::enumerateFiles("test");
-    removeTemp(list->names);
-    REQUIRE(list->names.size() == cnt2);
-    VirtFs::freeList(list);
-
-    VirtFs::permitLinks(false);
-    list = VirtFs::enumerateFiles("test");
-    removeTemp(list->names);
-    REQUIRE(list->names.size() == cnt1);
-    VirtFs::freeList(list);
-
-    list = VirtFs::enumerateFiles("test/units.xml");
-    removeTemp(list->names);
-    REQUIRE(list->names.empty());
-    VirtFs::freeList(list);
-
-    VirtFs::unmountDirSilent("data");
-    VirtFs::unmountDirSilent("../data");
-}
-
-TEST_CASE("VirtFs enumerateFiles2", "")
-{
-    VirtFs::mountDirSilent("data/test/dir1",
-        Append_false);
-    VirtFs::mountDirSilent("../data/test/dir1",
-        Append_false);
-
-    VirtFs::List *list = nullptr;
-
-    list = VirtFs::enumerateFiles("/");
-    REQUIRE(list->names.size() == 5);
-    VirtFs::freeList(list);
-
-    VirtFs::unmountDirSilent("data/test/dir1");
-    VirtFs::unmountDirSilent("../data/test/dir1");
-}
-
-TEST_CASE("VirtFs enumerateFiles3", "")
-{
-    std::string name("data/test/test.zip");
-    std::string prefix;
-    if (Files::existsLocal(name) == false)
-        prefix = "../" + prefix;
-
-    VirtFs::mountZip(prefix + "data/test/test.zip",
-        Append_false);
-
-    VirtFs::List *list = nullptr;
-
-    list = VirtFs::enumerateFiles("/");
-    REQUIRE(list->names.size() == 1);
-    REQUIRE(inList(list, "dir"));
-    VirtFs::freeList(list);
-
-    VirtFs::unmountZip(prefix + "data/test/test.zip");
-}
-
-TEST_CASE("VirtFs enumerateFiles4", "")
-{
-    std::string name("data/test/test.zip");
-    std::string prefix;
-    if (Files::existsLocal(name) == false)
-        prefix = "../" + prefix;
-
-    VirtFs::mountZip(prefix + "data/test/test2.zip",
-        Append_false);
-
-    VirtFs::List *list = nullptr;
-
-    list = VirtFs::enumerateFiles("/");
-    REQUIRE(list->names.size() == 4);
-    REQUIRE(inList(list, "dir"));
-    REQUIRE(inList(list, "dir2"));
-    REQUIRE(inList(list, "test.txt"));
-    REQUIRE(inList(list, "units.xml"));
-    VirtFs::freeList(list);
-
-    VirtFs::unmountZip(prefix + "data/test/test2.zip");
-}
-
-TEST_CASE("VirtFs enumerateFiles5", "")
-{
-    std::string name("data/test/test.zip");
-    std::string prefix;
-    if (Files::existsLocal(name) == false)
-        prefix = "../" + prefix;
-
-    VirtFs::mountZip(prefix + "data/test/test2.zip",
-        Append_false);
-    VirtFs::mountDirSilent(prefix + "data/test", Append_false);
-
-    VirtFs::List *list = nullptr;
-
-    list = VirtFs::enumerateFiles("dir2");
-    REQUIRE(inList(list, "file1.txt"));
-    REQUIRE(inList(list, "file2.txt"));
-    REQUIRE(inList(list, "hide.png"));
-    REQUIRE(inList(list, "paths.xml"));
-    REQUIRE(inList(list, "test.txt"));
-    REQUIRE(inList(list, "units.xml"));
-    VirtFs::freeList(list);
-
-    VirtFs::unmountZip(prefix + "data/test/test2.zip");
-    VirtFs::unmountDirSilent(prefix + "data/test");
-}
-
-TEST_CASE("VirtFs isDirectory1", "")
-{
-    VirtFs::mountDirSilent("data", Append_false);
-    VirtFs::mountDirSilent("../data", Append_false);
-
-    REQUIRE(VirtFs::isDirectory("test/units.xml") == false);
-    REQUIRE(VirtFs::isDirectory("test/units.xml/") == false);
-    REQUIRE(VirtFs::isDirectory("test//units.xml") == false);
-    REQUIRE(VirtFs::isDirectory("test/units123.xml") == false);
-    REQUIRE(VirtFs::isDirectory("test//units123.xml") == false);
-    REQUIRE(VirtFs::isDirectory("tesQ/units.xml") == false);
-    REQUIRE(VirtFs::isDirectory("tesQ//units.xml") == false);
-    REQUIRE(VirtFs::isDirectory("units.xml") == false);
-    REQUIRE(VirtFs::isDirectory("test") == true);
-    REQUIRE(VirtFs::isDirectory("test/") == true);
-    REQUIRE(VirtFs::isDirectory("test//") == true);
-    REQUIRE(VirtFs::isDirectory("test/dir1") == true);
-    REQUIRE(VirtFs::isDirectory("test//dir1") == true);
-    REQUIRE(VirtFs::isDirectory("test//dir1/") == true);
-    REQUIRE(VirtFs::isDirectory("test//dir1//") == true);
-    REQUIRE(VirtFs::isDirectory("test/dir1/") == true);
-    REQUIRE(VirtFs::isDirectory("test/dir1//") == true);
-    REQUIRE(VirtFs::isDirectory("testQ") == false);
-    REQUIRE(VirtFs::isDirectory("testQ/") == false);
-    REQUIRE(VirtFs::isDirectory("testQ//") == false);
-
-    VirtFs::mountDirSilent("data/test", Append_false);
-    VirtFs::mountDirSilent("../data/test", Append_false);
-
-    REQUIRE(VirtFs::isDirectory("test/units.xml") == false);
-    REQUIRE(VirtFs::isDirectory("test/units.xml/") == false);
-    REQUIRE(VirtFs::isDirectory("test//units.xml") == false);
-    REQUIRE(VirtFs::isDirectory("test/units123.xml") == false);
-    REQUIRE(VirtFs::isDirectory("tesQ/units.xml") == false);
-    REQUIRE(VirtFs::isDirectory("units.xml") == false);
-    REQUIRE(VirtFs::isDirectory("test") == true);
-    REQUIRE(VirtFs::isDirectory("testQ") == false);
-    REQUIRE(VirtFs::isDirectory("test/dir1") == true);
-
-    VirtFs::unmountDirSilent("data/test");
-    VirtFs::unmountDirSilent("../data/test");
-
-    REQUIRE(VirtFs::isDirectory("test/units.xml") == false);
-    REQUIRE(VirtFs::isDirectory("test/units123.xml") == false);
-    REQUIRE(VirtFs::isDirectory("tesQ/units.xml") == false);
-    REQUIRE(VirtFs::isDirectory("units.xml") == false);
-    REQUIRE(VirtFs::isDirectory("units.xml/") == false);
-    REQUIRE(VirtFs::isDirectory("test") == true);
-    REQUIRE(VirtFs::isDirectory("test/") == true);
-    REQUIRE(VirtFs::isDirectory("testQ") == false);
-    REQUIRE(VirtFs::isDirectory("test/dir1") == true);
-
-    VirtFs::unmountDirSilent("data");
-    VirtFs::unmountDirSilent("../data");
-}
-
-TEST_CASE("VirtFs isDirectory2", "")
-{
-    std::string name("data/test/test.zip");
-    std::string prefix;
-    if (Files::existsLocal(name) == false)
-        prefix = "../" + prefix;
-
-    VirtFs::mountZip(prefix + "data/test/test2.zip", Append_false);
-
-    REQUIRE(VirtFs::isDirectory("test/units.xml") == false);
-    REQUIRE(VirtFs::isDirectory("dir") == true);
-    REQUIRE(VirtFs::isDirectory("dir/") == true);
-    REQUIRE(VirtFs::isDirectory("dir//") == true);
-    REQUIRE(VirtFs::isDirectory("dir2") == true);
-    REQUIRE(VirtFs::isDirectory("dir3") == false);
-    REQUIRE(VirtFs::isDirectory("test.txt") == false);
-
-    VirtFs::unmountZip(prefix + "data/test/test2.zip");
-}
-
-TEST_CASE("VirtFs isDirectory3", "")
-{
-    std::string name("data/test/test.zip");
-    std::string prefix;
-    if (Files::existsLocal(name) == false)
-        prefix = "../" + prefix;
-
-    VirtFs::mountDir(prefix + "data", Append_false);
-    VirtFs::mountZip(prefix + "data/test/test2.zip", Append_false);
-
-    REQUIRE(VirtFs::isDirectory("test/units.xml") == false);
-    REQUIRE(VirtFs::isDirectory("test"));
-    REQUIRE(VirtFs::isDirectory("test//dye.png") == false);
-    REQUIRE(VirtFs::isDirectory("dir"));
-    REQUIRE(VirtFs::isDirectory("dir/"));
-    REQUIRE(VirtFs::isDirectory("dir//"));
-    REQUIRE(VirtFs::isDirectory("dir2"));
-    REQUIRE(VirtFs::isDirectory("dir3") == false);
-    REQUIRE(VirtFs::isDirectory("test.txt") == false);
-    REQUIRE(VirtFs::isDirectory("dir/hide.png") == false);
-
-    VirtFs::unmountZip(prefix + "data/test/test2.zip");
-    VirtFs::unmountDir(prefix + "data");
-}
-
-TEST_CASE("VirtFs openRead1", "")
-{
-    VirtFs::mountDirSilent("data", Append_false);
-    VirtFs::mountDirSilent("../data", Append_false);
-
-    VirtFs::File *file = nullptr;
-
-    file = VirtFs::openRead("test/units.xml");
-    REQUIRE(file != nullptr);
-    VirtFs::close(file);
-    file = VirtFs::openRead("test/units123.xml");
-    REQUIRE(file == nullptr);
-    file = VirtFs::openRead("tesQ/units.xml");
-    REQUIRE(file == nullptr);
-    file = VirtFs::openRead("units.xml");
-    REQUIRE(file == nullptr);
-//    file = VirtFs::openRead("test");
-//    REQUIRE(file == nullptr);
-    file = VirtFs::openRead("testQ");
-    REQUIRE(file == nullptr);
-
-    VirtFs::mountDirSilent("data/test", Append_false);
-    VirtFs::mountDirSilent("../data/test", Append_false);
-
-    file = VirtFs::openRead("test/units.xml");
-    REQUIRE(file != nullptr);
-    VirtFs::close(file);
-    file = VirtFs::openRead("test/units123.xml");
-    REQUIRE(file == nullptr);
-    file = VirtFs::openRead("tesQ/units.xml");
-    REQUIRE(file == nullptr);
-    file = VirtFs::openRead("units.xml");
-    REQUIRE(file != nullptr);
-    VirtFs::close(file);
-//    file = VirtFs::openRead("test");
-//    REQUIRE(file == nullptr);
-    file = VirtFs::openRead("testQ");
-    REQUIRE(file == nullptr);
-
-    VirtFs::unmountDirSilent("data/test");
-    VirtFs::unmountDirSilent("../data/test");
-
-    file = VirtFs::openRead("test/units.xml");
-    REQUIRE(file != nullptr);
-    VirtFs::close(file);
-    file = VirtFs::openRead("test/units123.xml");
-    REQUIRE(file == nullptr);
-    file = VirtFs::openRead("tesQ/units.xml");
-    REQUIRE(file == nullptr);
-    file = VirtFs::openRead("units.xml");
-    REQUIRE(file == nullptr);
-//    file = VirtFs::openRead("test");
-//    REQUIRE(file == nullptr);
-    file = VirtFs::openRead("testQ");
-    REQUIRE(file == nullptr);
-
-    VirtFs::unmountDirSilent("data");
-    VirtFs::unmountDirSilent("../data");
-}
-
-TEST_CASE("VirtFs openRead2", "")
-{
-    std::string name("data/test/test.zip");
-    std::string prefix;
-    if (Files::existsLocal(name) == false)
-        prefix = "../" + prefix;
-
-    VirtFs::mountZip(prefix + "data/test/test2.zip", Append_false);
-
-    VirtFs::File *file = nullptr;
-
-    file = VirtFs::openRead("test/units.xml");
-    REQUIRE(file == nullptr);
-    file = VirtFs::openRead("units.xml");
-    REQUIRE(file != nullptr);
-    VirtFs::close(file);
-    file = VirtFs::openRead("dir/hide.png");
-    REQUIRE(file != nullptr);
-    VirtFs::close(file);
-    file = VirtFs::openRead("dir//hide.png");
-    REQUIRE(file != nullptr);
-    VirtFs::close(file);
-
-    VirtFs::unmountZip(prefix + "data/test/test2.zip");
-}
-
-TEST_CASE("VirtFs openRead3", "")
-{
-    std::string name("data/test/test.zip");
-    std::string prefix;
-    if (Files::existsLocal(name) == false)
-        prefix = "../" + prefix;
-
-    VirtFs::mountZip(prefix + "data/test/test2.zip", Append_false);
-    VirtFs::mountDir(prefix + "data/test", Append_false);
-
-    VirtFs::File *file = nullptr;
-
-    file = VirtFs::openRead("test/units.xml");
-    REQUIRE(file == nullptr);
-    file = VirtFs::openRead("units.xml");
-    REQUIRE(file != nullptr);
-    VirtFs::close(file);
-    file = VirtFs::openRead("dir/hide.png");
-    REQUIRE(file != nullptr);
-    VirtFs::close(file);
-    file = VirtFs::openRead("dir//hide.png");
-    REQUIRE(file != nullptr);
-    VirtFs::close(file);
-    file = VirtFs::openRead("dir/dye.png");
-    REQUIRE(file != nullptr);
-    VirtFs::close(file);
-    file = VirtFs::openRead("dir/dye.pn_");
-    REQUIRE(file == nullptr);
-
-    VirtFs::unmountZip(prefix + "data/test/test2.zip");
-    VirtFs::unmountDir(prefix + "data/test");
-}
-
-TEST_CASE("VirtFs getRealDir1", "")
-{
-    const std::string sep = dirSeparator;
-    REQUIRE(VirtFs::getRealDir(".").empty());
-    REQUIRE(VirtFs::getRealDir("..").empty());
-    const bool dir1 = VirtFs::mountDirSilent("data", Append_false);
-    REQUIRE((dir1 || VirtFs::mountDirSilent("../data", Append_false))
-        == true);
-    if (dir1 == true)
-    {
-        REQUIRE(VirtFs::getRealDir("test") == "data");
-        REQUIRE(VirtFs::getRealDir("test/test.txt") ==
-            "data");
-    }
-    else
-    {
-        REQUIRE(VirtFs::getRealDir("test") == "../data");
-        REQUIRE(VirtFs::getRealDir("test/test.txt") ==
-            "../data");
-    }
-    REQUIRE(VirtFs::getRealDir("zzz").empty());
-
-    VirtFs::mountDirSilent("data/test", Append_false);
-    VirtFs::mountDirSilent("../data/test", Append_false);
-    if (dir1 == true)
-    {
-        REQUIRE(VirtFs::getRealDir("test") == "data");
-        REQUIRE(VirtFs::getRealDir("test/test.txt") ==
-            "data");
-        REQUIRE(VirtFs::getRealDir("test.txt") ==
-            "data" + sep + "test");
-    }
-    else
-    {
-        REQUIRE(VirtFs::getRealDir("test") == ".." + sep + "data");
-        REQUIRE(VirtFs::getRealDir("test/test.txt") ==
-            ".." + sep + "data");
-        REQUIRE(VirtFs::getRealDir("test.txt") ==
-            ".." + sep + "data" + sep + "test");
-    }
-    REQUIRE(VirtFs::getRealDir("zzz").empty());
-
-    if (dir1 == true)
-    {
-        VirtFs::mountZip("data/test/test.zip", Append_false);
-        REQUIRE(VirtFs::getRealDir("dir/brimmedhat.png") ==
-            "data" + sep + "test" + sep + "test.zip");
-        REQUIRE(VirtFs::getRealDir("hide.png") ==
-            "data" + sep + "test");
-    }
-    else
-    {
-        VirtFs::mountZip("../data/test/test.zip", Append_false);
-        REQUIRE(VirtFs::getRealDir("dir/brimmedhat.png") ==
-            ".." + sep + "data" + sep + "test" + sep + "test.zip");
-        REQUIRE(VirtFs::getRealDir("hide.png") ==
-            ".." + sep + "data" + sep + "test");
-    }
-
-    VirtFs::unmountDirSilent("data/test");
-    VirtFs::unmountDirSilent("../data/test");
-
-    if (dir1 == true)
-    {
-        REQUIRE(VirtFs::getRealDir("test") == "data");
-        REQUIRE(VirtFs::getRealDir("test/test.txt") ==
-            "data");
-        REQUIRE(VirtFs::getRealDir("dir/hide.png") ==
-            "data" + sep + "test" + sep + "test.zip");
-    }
-    else
-    {
-        REQUIRE(VirtFs::getRealDir("test") == ".." + sep + "data");
-        REQUIRE(VirtFs::getRealDir("test/test.txt") ==
-            ".." + sep + "data");
-        REQUIRE(VirtFs::getRealDir("dir/hide.png") ==
-            ".." + sep + "data" + sep + "test" + sep + "test.zip");
-    }
-    REQUIRE(VirtFs::exists("dir/hide.png"));
-    REQUIRE(VirtFs::getRealDir("zzz").empty());
-
-    VirtFs::unmountDirSilent("data");
-    VirtFs::unmountDirSilent("../data");
-    if (dir1 == true)
-        VirtFs::unmountZip("data/test/test.zip");
-    else
-        VirtFs::unmountZip("../data/test/test.zip");
-}
-
-TEST_CASE("VirtFs getrealDir2", "")
-{
-    const std::string sep = dirSeparator;
-    std::string name("data/test/test.zip");
-    std::string prefix;
-    if (Files::existsLocal(name) == false)
-        prefix = "../" + prefix;
-
-    VirtFs::mountZip(prefix + "data/test/test2.zip", Append_false);
-    VirtFs::mountDir(prefix + "data/test", Append_false);
-    VirtFs::mountDir(prefix + "data", Append_false);
-
-    REQUIRE(VirtFs::getRealDir("zzz").empty());
-
-    REQUIRE(VirtFs::getRealDir("dir1/file1.txt") ==
-        prefix + "data" + sep + "test");
-    REQUIRE(VirtFs::getRealDir("hide.png") ==
-        prefix + "data" + sep + "test");
-    REQUIRE(VirtFs::getRealDir("dir//hide.png") ==
-        prefix + "data" + sep + "test" + sep + "test2.zip");
-    REQUIRE(VirtFs::getRealDir("dir/1//test.txt") ==
-        prefix + "data" + sep + "test" + sep + "test2.zip");
-
-    VirtFs::unmountZip(prefix + "data/test/test2.zip");
-    VirtFs::unmountDir(prefix + "data/test");
-    VirtFs::unmountDir(prefix + "data");
-}
-
-TEST_CASE("VirtFs getrealDir3", "")
-{
-    const std::string sep = dirSeparator;
-    std::string name("data/test/test.zip");
-    std::string prefix;
-    if (Files::existsLocal(name) == false)
-        prefix = "../" + prefix;
-
-    VirtFs::mountZip2(prefix + "data/test/test2.zip",
-        "dir",
-        Append_false);
-    VirtFs::mountDir(prefix + "data/test", Append_false);
-
-    REQUIRE(VirtFs::getRealDir("zzz").empty());
-
-    REQUIRE(VirtFs::getRealDir("dir1/file1.txt") ==
-        prefix + "data" + sep + "test");
-    REQUIRE(VirtFs::getRealDir("hide.png") ==
-        prefix + "data" + sep + "test");
-    REQUIRE(VirtFs::getRealDir("hide.png") ==
-        prefix + "data" + sep + "test");
-    REQUIRE(VirtFs::getRealDir("1//test.txt") ==
-        prefix + "data" + sep + "test" + sep + "test2.zip");
-
-    VirtFs::unmountZip2(prefix + "data/test/test2.zip",
-        "dir");
-    VirtFs::unmountDir(prefix + "data/test");
-}
-
-TEST_CASE("VirtFs permitLinks1", "")
-{
-    VirtFs::mountDirSilent("data", Append_false);
-    VirtFs::mountDirSilent("../data", Append_false);
-
-    const int cnt1 = VirtFs::exists("test/test2.txt") ? 26 : 25;
-    const int cnt2 = 26;
-
-    StringVect list;
-    VirtFs::permitLinks(false);
-    VirtFs::getFiles("test", list);
-    removeTemp(list);
-    const size_t sz = list.size();
-    REQUIRE(sz == cnt1);
-
-    list.clear();
-    VirtFs::permitLinks(true);
-    VirtFs::getFiles("test", list);
-    removeTemp(list);
-    REQUIRE(list.size() == cnt2);
-
-    list.clear();
-    VirtFs::permitLinks(false);
-    VirtFs::getFiles("test", list);
-    removeTemp(list);
-    REQUIRE(list.size() == cnt1);
-
-    VirtFs::unmountDirSilent("data");
-    VirtFs::unmountDirSilent("../data");
-}
-
-TEST_CASE("VirtFs permitLinks2", "")
-{
-    VirtFs::mountDirSilent2("data",
-        "test",
-        Append_false);
-    VirtFs::mountDirSilent2("../data",
-        "test",
-        Append_false);
-
-    const int cnt1 = VirtFs::exists("test2.txt") ? 26 : 25;
-    const int cnt2 = 26;
-
-    StringVect list;
-    VirtFs::permitLinks(false);
-    VirtFs::getFiles(dirSeparator, list);
-    removeTemp(list);
-    const size_t sz = list.size();
-    REQUIRE(sz == cnt1);
-
-    list.clear();
-    VirtFs::permitLinks(true);
-    VirtFs::getFiles(dirSeparator, list);
-    removeTemp(list);
-    REQUIRE(list.size() == cnt2);
-
-    list.clear();
-    VirtFs::permitLinks(false);
-    VirtFs::getFiles(dirSeparator, list);
-    removeTemp(list);
-    REQUIRE(list.size() == cnt1);
-
-    VirtFs::unmountDirSilent2("data",
-        "test");
-    VirtFs::unmountDirSilent2("../data",
-        "test");
-}
-
-TEST_CASE("VirtFs read1", "")
-{
-    VirtFs::mountDirSilent("data", Append_false);
-    VirtFs::mountDirSilent("../data", Append_false);
-
-    VirtFs::File *file = VirtFs::openRead("test/test.txt");
-    REQUIRE(file != nullptr);
-    REQUIRE(VirtFs::fileLength(file) == 23);
-    const int fileSize = VirtFs::fileLength(file);
-
-    void *restrict buffer = calloc(fileSize + 1, 1);
-    REQUIRE(VirtFs::read(file, buffer, 1, fileSize) == fileSize);
-    REQUIRE(strcmp(static_cast<char*>(buffer),
-        "test line 1\ntest line 2") == 0);
-    REQUIRE(VirtFs::tell(file) == fileSize);
-    REQUIRE(VirtFs::eof(file) == true);
-
-    free(buffer);
-    buffer = calloc(fileSize + 1, 1);
-    REQUIRE(VirtFs::seek(file, 12) != 0);
-    REQUIRE(VirtFs::eof(file) == false);
-    REQUIRE(VirtFs::tell(file) == 12);
-    REQUIRE(VirtFs::read(file, buffer, 1, 11) == 11);
-    REQUIRE(strcmp(static_cast<char*>(buffer),
-        "test line 2") == 0);
-    REQUIRE(VirtFs::eof(file) == true);
-
-    VirtFs::close(file);
-    free(buffer);
-
-    VirtFs::unmountDirSilent("data");
-    VirtFs::unmountDirSilent("../data");
-}
-
-TEST_CASE("VirtFs read2", "")
-{
-    std::string name("data/test/test.zip");
-    std::string prefix;
-    if (Files::existsLocal(name) == false)
-        prefix = "../" + prefix;
-
-    VirtFs::mountZip(prefix + "data/test/test2.zip", Append_false);
-
-    VirtFs::File *file = VirtFs::openRead("dir2/test.txt");
-    REQUIRE(file != nullptr);
-    REQUIRE(VirtFs::fileLength(file) == 23);
-    const int fileSize = VirtFs::fileLength(file);
-
-    void *restrict buffer = calloc(fileSize + 1, 1);
-    REQUIRE(VirtFs::read(file, buffer, 1, fileSize) == fileSize);
-    REQUIRE(strcmp(static_cast<char*>(buffer),
-        "test line 1\ntest line 2") == 0);
-    REQUIRE(VirtFs::tell(file) == fileSize);
-    REQUIRE(VirtFs::eof(file) == true);
-
-    free(buffer);
-    buffer = calloc(fileSize + 1, 1);
-    REQUIRE(VirtFs::seek(file, 12) != 0);
-    REQUIRE(VirtFs::eof(file) == false);
-    REQUIRE(VirtFs::tell(file) == 12);
-    REQUIRE(VirtFs::read(file, buffer, 1, 11) == 11);
-    REQUIRE(strcmp(static_cast<char*>(buffer),
-        "test line 2") == 0);
-    REQUIRE(VirtFs::eof(file) == true);
-
-    VirtFs::close(file);
-    free(buffer);
-
-    VirtFs::unmountZip(prefix + "data/test/test2.zip");
-}
-
-TEST_CASE("VirtFs read3", "")
-{
-    std::string name("data/test/test.zip");
-    std::string prefix;
-    if (Files::existsLocal(name) == false)
-        prefix = "../" + prefix;
-
-    VirtFs::mountZip(prefix + "data/test/test2.zip", Append_false);
-    VirtFs::mountDir(prefix + "data", Append_false);
-
-    VirtFs::File *file = VirtFs::openRead("dir2/test.txt");
-    REQUIRE(file != nullptr);
-    REQUIRE(VirtFs::fileLength(file) == 23);
-    const int fileSize = VirtFs::fileLength(file);
-
-    void *restrict buffer = calloc(fileSize + 1, 1);
-    REQUIRE(VirtFs::read(file, buffer, 1, fileSize) == fileSize);
-    REQUIRE(strcmp(static_cast<char*>(buffer),
-        "test line 1\ntest line 2") == 0);
-    REQUIRE(VirtFs::tell(file) == fileSize);
-    REQUIRE(VirtFs::eof(file) == true);
-
-    free(buffer);
-    buffer = calloc(fileSize + 1, 1);
-    REQUIRE(VirtFs::seek(file, 12) != 0);
-    REQUIRE(VirtFs::eof(file) == false);
-    REQUIRE(VirtFs::tell(file) == 12);
-    REQUIRE(VirtFs::read(file, buffer, 1, 11) == 11);
-    REQUIRE(strcmp(static_cast<char*>(buffer),
-        "test line 2") == 0);
-    REQUIRE(VirtFs::eof(file) == true);
-
-    VirtFs::close(file);
-    free(buffer);
-
-    VirtFs::unmountZip(prefix + "data/test/test2.zip");
-    VirtFs::unmountDir(prefix + "data");
-}
-
-TEST_CASE("VirtFs read4", "")
-{
-    std::string name("data/test/test.zip");
-    std::string prefix;
-    if (Files::existsLocal(name) == false)
-        prefix = "../" + prefix;
-
-    VirtFs::mountDir(prefix + "data/test", Append_true);
-    VirtFs::mountZip(prefix + "data/test/test5.zip", Append_true);
-
-    VirtFs::File *file = VirtFs::openRead("dir1/file1.txt");
-    REQUIRE(file != nullptr);
-    REQUIRE(VirtFs::fileLength(file) == 23);
-    const int fileSize = VirtFs::fileLength(file);
-
-    void *restrict buffer = calloc(fileSize + 1, 1);
-    REQUIRE(VirtFs::read(file, buffer, 1, fileSize) == fileSize);
-    REQUIRE(strcmp(static_cast<char*>(buffer),
-        "test line 1\ntest line 2") == 0);
-    REQUIRE(VirtFs::tell(file) == fileSize);
-    REQUIRE(VirtFs::eof(file) == true);
-
-    free(buffer);
-    buffer = calloc(fileSize + 1, 1);
-    REQUIRE(VirtFs::seek(file, 12) != 0);
-    REQUIRE(VirtFs::eof(file) == false);
-    REQUIRE(VirtFs::tell(file) == 12);
-    REQUIRE(VirtFs::read(file, buffer, 1, 11) == 11);
-    REQUIRE(strcmp(static_cast<char*>(buffer),
-        "test line 2") == 0);
-    REQUIRE(VirtFs::eof(file) == true);
-
-    VirtFs::close(file);
-    free(buffer);
-
-    VirtFs::unmountZip(prefix + "data/test/test5.zip");
-    VirtFs::unmountDir(prefix + "data/test");
-}
-
-TEST_CASE("VirtFs read5", "")
-{
-    std::string name("data/test/test.zip");
-    std::string prefix;
-    if (Files::existsLocal(name) == false)
-        prefix = "../" + prefix;
-
-    VirtFs::mountZip(prefix + "data/test/test5.zip", Append_true);
-    VirtFs::mountDir(prefix + "data/test", Append_true);
-
-    VirtFs::File *file = VirtFs::openRead("dir1/file1.txt");
-    REQUIRE(file != nullptr);
-    REQUIRE(VirtFs::fileLength(file) == 23);
-    const int fileSize = VirtFs::fileLength(file);
-
-    void *restrict buffer = calloc(fileSize + 1, 1);
-    REQUIRE(VirtFs::read(file, buffer, 1, fileSize) == fileSize);
-    REQUIRE(strcmp(static_cast<char*>(buffer),
-        "test line 3\ntest line 4") == 0);
-    REQUIRE(VirtFs::tell(file) == fileSize);
-    REQUIRE(VirtFs::eof(file) == true);
-
-    free(buffer);
-    buffer = calloc(fileSize + 1, 1);
-    REQUIRE(VirtFs::seek(file, 12) != 0);
-    REQUIRE(VirtFs::eof(file) == false);
-    REQUIRE(VirtFs::tell(file) == 12);
-    REQUIRE(VirtFs::read(file, buffer, 1, 11) == 11);
-    REQUIRE(strcmp(static_cast<char*>(buffer),
-        "test line 4") == 0);
-    REQUIRE(VirtFs::eof(file) == true);
-
-    VirtFs::close(file);
-    free(buffer);
-
-    VirtFs::unmountZip(prefix + "data/test/test5.zip");
-    VirtFs::unmountDir(prefix + "data/test");
-}
diff --git a/src/unittests/fs/virtfs/virtfs1_basic.cc b/src/unittests/fs/virtfs/virtfs1_basic.cc
deleted file mode 100644
index 73153df37..000000000
--- a/src/unittests/fs/virtfs/virtfs1_basic.cc
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2016-2017  The ManaPlus Developers
- *
- *  This file is part of The ManaPlus Client.
- *
- *  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
- *  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, see <http://www.gnu.org/licenses/>.
- */
-
-#include "unittests/unittests.h"
-
-#include "fs/virtfs/fs.h"
-
-#include "utils/checkutils.h"
-
-#ifndef UNITTESTS_CATCH
-#include <algorithm>
-#endif  // UNITTESTS_CATCH
-
-#include "debug.h"
-
-TEST_CASE("VirtFs1 getEntries", "")
-{
-    VirtFs::init(".");
-    REQUIRE(VirtFs::getEntries().empty());
-    REQUIRE(VirtFs::searchByRootInternal("test", std::string()) == nullptr);
-    VirtFs::deinit();
-}
-
-TEST_CASE("VirtFs1 getBaseDir", "")
-{
-    VirtFs::init(".");
-    REQUIRE(VirtFs::getBaseDir() != nullptr);
-    VirtFs::deinit();
-}
diff --git a/src/unittests/fs/virtfs/virtfs1_enumerate.cc b/src/unittests/fs/virtfs/virtfs1_enumerate.cc
deleted file mode 100644
index 4eb79e673..000000000
--- a/src/unittests/fs/virtfs/virtfs1_enumerate.cc
+++ /dev/null
@@ -1,410 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2016-2017  The ManaPlus Developers
- *
- *  This file is part of The ManaPlus Client.
- *
- *  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
- *  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, see <http://www.gnu.org/licenses/>.
- */
-
-#include "unittests/unittests.h"
-
-#include "fs/files.h"
-
-#include "fs/virtfs/fs.h"
-#include "fs/virtfs/list.h"
-
-#include "utils/checkutils.h"
-#include "utils/foreach.h"
-
-#ifndef UNITTESTS_CATCH
-#include <algorithm>
-#endif  // UNITTESTS_CATCH
-
-#include "debug.h"
-
-static void removeTemp(StringVect &restrict list)
-{
-    int cnt = 0;
-    std::sort(list.begin(), list.end());
-
-    FOR_EACH (StringVectIter, it, list)
-    {
-        if (*it != "serverlistplus.xml.part")
-        {
-            logger->log("file: %d %s",
-                cnt,
-                (*it).c_str());
-            cnt ++;
-        }
-    }
-
-    FOR_EACH (StringVectIter, it, list)
-    {
-        if (*it == "serverlistplus.xml.part")
-        {
-            list.erase(it);
-            return;
-        }
-    }
-}
-
-static bool inList(const VirtFs::List *const list,
-                   const std::string &name)
-{
-    FOR_EACH (StringVectCIter, it, list->names)
-    {
-        if (*it == name)
-            return true;
-    }
-    return false;
-}
-
-TEST_CASE("VirtFs1 enumerateFiles1", "")
-{
-    VirtFs::init(".");
-
-    VirtFs::mountDirSilent("data",
-        Append_false);
-    VirtFs::mountDirSilent("../data",
-        Append_false);
-
-    VirtFs::List *list = nullptr;
-
-    const int cnt1 = VirtFs::exists("test/test2.txt") ? 28 : 27;
-    const int cnt2 = 28;
-
-    VirtFs::permitLinks(false);
-    list = VirtFs::enumerateFiles("test");
-    removeTemp(list->names);
-    const size_t sz = list->names.size();
-    REQUIRE(sz == cnt1);
-    VirtFs::freeList(list);
-
-    VirtFs::permitLinks(true);
-    list = VirtFs::enumerateFiles("test/");
-    removeTemp(list->names);
-    REQUIRE(list->names.size() == cnt2);
-    VirtFs::freeList(list);
-
-    VirtFs::permitLinks(true);
-    list = VirtFs::enumerateFiles("test/units.xml");
-    REQUIRE(list->names.empty());
-    VirtFs::freeList(list);
-
-    VirtFs::permitLinks(false);
-    list = VirtFs::enumerateFiles("test\\");
-    removeTemp(list->names);
-    REQUIRE(list->names.size() == cnt1);
-    VirtFs::freeList(list);
-
-    VirtFs::unmountDirSilent("data");
-    VirtFs::unmountDirSilent("../data");
-    VirtFs::deinit();
-}
-
-TEST_CASE("VirtFs1 enumerateFiles2", "")
-{
-    VirtFs::init(".");
-
-    VirtFs::mountDirSilent("data/test/dir1",
-        Append_false);
-    VirtFs::mountDirSilent("../data/test/dir1",
-        Append_false);
-
-    VirtFs::List *list = nullptr;
-
-    list = VirtFs::enumerateFiles("/");
-    REQUIRE(list->names.size() == 5);
-    REQUIRE(inList(list, "file1.txt"));
-    REQUIRE_FALSE(inList(list, "file2.txt"));
-    VirtFs::freeList(list);
-    VirtFs::deinit();
-}
-
-TEST_CASE("VirtFs1 enumerateFiles3", "")
-{
-    VirtFs::init(".");
-
-    VirtFs::mountDirSilent("data/test/dir1",
-        Append_false);
-    VirtFs::mountDirSilent("../data/test/dir1",
-        Append_false);
-    VirtFs::mountDirSilent("data/test/dir2",
-        Append_false);
-    VirtFs::mountDirSilent("../data/test/dir2",
-        Append_false);
-
-    VirtFs::List *list = nullptr;
-
-    list = VirtFs::enumerateFiles("/");
-    REQUIRE(inList(list, "file1.txt"));
-    REQUIRE(inList(list, "file2.txt"));
-    VirtFs::freeList(list);
-    VirtFs::deinit();
-}
-
-TEST_CASE("VirtFsZip enumerateFiles4", "")
-{
-    VirtFs::init(".");
-    std::string name("data/test/test.zip");
-    std::string prefix("data\\test/");
-    if (Files::existsLocal(name) == false)
-        prefix = "../" + prefix;
-
-    VirtFs::mountZip(prefix + "test.zip",
-        Append_false);
-
-    VirtFs::List *list = nullptr;
-
-    list = VirtFs::enumerateFiles("dir");
-    REQUIRE(list->names.size() == 2);
-    REQUIRE(inList(list, "brimmedhat.png"));
-    REQUIRE(inList(list, "hide.png"));
-    VirtFs::freeList(list);
-
-    VirtFs::unmountZip(prefix + "test.zip");
-    VirtFs::deinit();
-}
-
-TEST_CASE("VirtFsZip enumerateFiles5", "")
-{
-    VirtFs::init(".");
-    std::string name("data/test/test.zip");
-    std::string prefix("data//test/");
-    if (Files::existsLocal(name) == false)
-        prefix = "../" + prefix;
-
-    VirtFs::mountZip(prefix + "test.zip",
-        Append_true);
-    VirtFs::mountZip(prefix + "test2.zip",
-        Append_true);
-
-    VirtFs::List *list = nullptr;
-
-    list = VirtFs::enumerateFiles("dir");
-    FOR_EACH (StringVectCIter, it, list->names)
-    {
-        logger->log("filename: " + *it);
-    }
-
-    REQUIRE(list->names.size() == 5);
-    REQUIRE(inList(list, "brimmedhat.png"));
-    REQUIRE(inList(list, "hide.png"));
-    REQUIRE(inList(list, "1"));
-    REQUIRE(inList(list, "gpl"));
-    REQUIRE(inList(list, "dye.png"));
-    VirtFs::freeList(list);
-
-    VirtFs::unmountZip(prefix + "test.zip");
-    VirtFs::unmountZip(prefix + "test2.zip");
-    VirtFs::deinit();
-}
-
-TEST_CASE("VirtFsZip enumerateFiles6", "")
-{
-    VirtFs::init(".");
-    std::string name("data/test/test.zip");
-    std::string prefix("data\\test/");
-    if (Files::existsLocal(name) == false)
-        prefix = "../" + prefix;
-
-    VirtFs::mountZip(prefix + "test.zip",
-        Append_false);
-
-    VirtFs::List *list = nullptr;
-
-    list = VirtFs::enumerateFiles("/");
-    REQUIRE(list->names.size() == 1);
-    REQUIRE(inList(list, "dir"));
-    VirtFs::freeList(list);
-
-    VirtFs::unmountZip(prefix + "test.zip");
-    VirtFs::deinit();
-}
-
-TEST_CASE("VirtFsZip enumerateFiles7", "")
-{
-    VirtFs::init(".");
-    std::string name("data/test/test.zip");
-    std::string prefix("data\\test/");
-    if (Files::existsLocal(name) == false)
-        prefix = "../" + prefix;
-
-    VirtFs::mountZip(prefix + "test2.zip",
-        Append_false);
-
-    VirtFs::List *list = nullptr;
-
-    list = VirtFs::enumerateFiles("/");
-    REQUIRE(list->names.size() == 4);
-    REQUIRE(inList(list, "dir"));
-    REQUIRE(inList(list, "dir2"));
-    REQUIRE(inList(list, "test.txt"));
-    REQUIRE(inList(list, "units.xml"));
-    VirtFs::freeList(list);
-
-    VirtFs::unmountZip(prefix + "test2.zip");
-    VirtFs::deinit();
-}
-
-TEST_CASE("VirtFsZip enumerateFiles8", "")
-{
-    VirtFs::init(".");
-    std::string name("data/test/test.zip");
-    std::string prefix;
-    if (Files::existsLocal(name) == false)
-        prefix = "../" + prefix;
-
-    VirtFs::mountZip(prefix + "data/test/test2.zip",
-        Append_false);
-    VirtFs::mountDirSilent(prefix + "data/test",
-        Append_false);
-
-    VirtFs::List *list = nullptr;
-
-    list = VirtFs::enumerateFiles("dir2");
-    REQUIRE(list->names.size() >= 6);
-    REQUIRE(inList(list, "file1.txt"));
-    REQUIRE(inList(list, "file2.txt"));
-    REQUIRE(inList(list, "hide.png"));
-    REQUIRE(inList(list, "paths.xml"));
-    REQUIRE(inList(list, "test.txt"));
-    REQUIRE(inList(list, "units.xml"));
-    VirtFs::freeList(list);
-
-    VirtFs::unmountZip(prefix + "data/test/test2.zip");
-    VirtFs::unmountDir(prefix + "data/test");
-    VirtFs::deinit();
-}
-
-TEST_CASE("VirtFsZip enumerateFiles9", "")
-{
-    VirtFs::init(".");
-    std::string name("data/test/test.zip");
-    std::string prefix;
-    if (Files::existsLocal(name) == false)
-        prefix = "../" + prefix;
-
-    VirtFs::mountZip(prefix + "data/test/test2.zip",
-        Append_false);
-    VirtFs::mountDirSilent(prefix + "data/test",
-        Append_false);
-
-    VirtFs::List *list = nullptr;
-
-    list = VirtFs::enumerateFiles("dir");
-    REQUIRE(list->names.size() == 4);
-    REQUIRE(inList(list, "1"));
-    REQUIRE(inList(list, "gpl"));
-    REQUIRE(inList(list, "dye.png"));
-    REQUIRE(inList(list, "hide.png"));
-    VirtFs::freeList(list);
-
-    VirtFs::unmountZip(prefix + "data/test/test2.zip");
-    VirtFs::unmountDir(prefix + "data/test");
-    VirtFs::deinit();
-}
-
-TEST_CASE("VirtFsZip enumerateFiles10", "")
-{
-    VirtFs::init(".");
-    std::string name("data/test/test.zip");
-    std::string prefix("data\\test/");
-    if (Files::existsLocal(name) == false)
-        prefix = "../" + prefix;
-
-    VirtFs::mountZip2(prefix + "test.zip",
-        "dir",
-        Append_false);
-
-    VirtFs::List *list = nullptr;
-
-    list = VirtFs::enumerateFiles("/");
-    REQUIRE(list->names.size() == 2);
-    REQUIRE(inList(list, "brimmedhat.png"));
-    REQUIRE(inList(list, "hide.png"));
-    VirtFs::freeList(list);
-
-    VirtFs::unmountZip2(prefix + "test.zip",
-        "dir");
-    VirtFs::deinit();
-}
-
-TEST_CASE("VirtFsZip enumerateFiles11", "")
-{
-    VirtFs::init(".");
-    std::string name("data/test/test.zip");
-    std::string prefix("data\\test/");
-    if (Files::existsLocal(name) == false)
-        prefix = "../" + prefix;
-
-    VirtFs::mountZip2(prefix + "test2.zip",
-        "dir",
-        Append_false);
-
-    VirtFs::List *list = nullptr;
-
-    list = VirtFs::enumerateFiles("1");
-    REQUIRE(list->names.size() == 2);
-    REQUIRE(inList(list, "file1.txt"));
-    REQUIRE(inList(list, "test.txt"));
-    VirtFs::freeList(list);
-
-    VirtFs::unmountZip2(prefix + "test2.zip",
-        "dir");
-    VirtFs::deinit();
-}
-
-TEST_CASE("VirtFs1 enumerateFiles12", "")
-{
-    VirtFs::init(".");
-
-    VirtFs::mountDirSilent2("data/test",
-        "dir2",
-        Append_false);
-    VirtFs::mountDirSilent2("../data/test",
-        "dir2",
-        Append_false);
-
-    VirtFs::List *list = nullptr;
-
-    list = VirtFs::enumerateFiles("/");
-    REQUIRE(inList(list, "file1.txt"));
-    REQUIRE(inList(list, "file2.txt"));
-    VirtFs::freeList(list);
-
-    VirtFs::deinit();
-}
-
-TEST_CASE("VirtFs1 enumerateFiles13", "")
-{
-    VirtFs::init(".");
-
-    VirtFs::mountDirSilent2("data",
-        "test",
-        Append_false);
-    VirtFs::mountDirSilent2("../data",
-        "test",
-        Append_false);
-
-    VirtFs::List *list = nullptr;
-
-    list = VirtFs::enumerateFiles("dir2");
-    REQUIRE(inList(list, "file1.txt"));
-    REQUIRE(inList(list, "file2.txt"));
-    VirtFs::freeList(list);
-
-    VirtFs::deinit();
-}
diff --git a/src/unittests/fs/virtfs/virtfs1_exists.cc b/src/unittests/fs/virtfs/virtfs1_exists.cc
deleted file mode 100644
index 24f3e19f2..000000000
--- a/src/unittests/fs/virtfs/virtfs1_exists.cc
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2016-2017  The ManaPlus Developers
- *
- *  This file is part of The ManaPlus Client.
- *
- *  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
- *  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, see <http://www.gnu.org/licenses/>.
- */
-
-#include "unittests/unittests.h"
-
-#include "fs/virtfs/fs.h"
-
-#include "utils/checkutils.h"
-
-#ifndef UNITTESTS_CATCH
-#include <algorithm>
-#endif  // UNITTESTS_CATCH
-
-#include "debug.h"
-
-TEST_CASE("VirtFs1 exists1", "")
-{
-    VirtFs::init(".");
-    const bool dir1 = VirtFs::mountDirSilent("data/",
-        Append_false);
-    VirtFs::mountDirSilent("..\\data",
-        Append_false);
-
-    REQUIRE(VirtFs::exists("test"));
-    REQUIRE(VirtFs::exists("test/"));
-    REQUIRE(VirtFs::exists("test/dir1"));
-    REQUIRE(VirtFs::exists("test/dir1/"));
-    REQUIRE(VirtFs::exists("test/dir") == false);
-    REQUIRE(VirtFs::exists("test//units.xml") == true);
-    REQUIRE(VirtFs::exists("test/\\units123.xml") == false);
-    REQUIRE(VirtFs::exists("tesQ/units.xml") == false);
-    REQUIRE(VirtFs::exists("units.xml") == false);
-
-    if (dir1 == true)
-    {
-        VirtFs::mountDir("data//test",
-            Append_false);
-    }
-    else
-    {
-        VirtFs::mountDirSilent("..//data\\test",
-            Append_false);
-    }
-
-    REQUIRE(VirtFs::exists("test") == true);
-    REQUIRE(VirtFs::exists("test/dir1"));
-    REQUIRE(VirtFs::exists("test/dir1\\"));
-    REQUIRE(VirtFs::exists("test/dir") == false);
-    REQUIRE(VirtFs::exists("test\\units.xml") == true);
-    REQUIRE(VirtFs::exists("test/units123.xml") == false);
-    REQUIRE(VirtFs::exists("tesQ/units.xml") == false);
-    REQUIRE(VirtFs::exists("units.xml") == true);
-    REQUIRE(VirtFs::exists("units.xml/") == false);
-
-    if (dir1 == true)
-        VirtFs::unmountDirSilent("data/test");
-    else
-        VirtFs::unmountDirSilent("../data/test");
-
-    REQUIRE(VirtFs::exists("test") == true);
-    REQUIRE(VirtFs::exists("test/dir1"));
-    REQUIRE(VirtFs::exists("test/dir") == false);
-    REQUIRE(VirtFs::exists("test\\units.xml") == true);
-    REQUIRE(VirtFs::exists("test/units123.xml") == false);
-    REQUIRE(VirtFs::exists("tesQ/units.xml") == false);
-    REQUIRE(VirtFs::exists("units.xml") == false);
-    REQUIRE(VirtFs::exists("units.xml/") == false);
-
-    VirtFs::deinit();
-}
-
-TEST_CASE("VirtFs1 exists2", "")
-{
-    VirtFs::init(".");
-    const bool dir1 = VirtFs::mountDirSilent2("data/",
-        "test",
-        Append_false);
-    VirtFs::mountDirSilent2("..\\data",
-        "test",
-        Append_false);
-
-    REQUIRE(VirtFs::exists("test") == false);
-    REQUIRE(VirtFs::exists("test/") == false);
-    REQUIRE(VirtFs::exists("dir1"));
-    REQUIRE(VirtFs::exists("dir1/"));
-    REQUIRE(VirtFs::exists("dir") == false);
-    REQUIRE(VirtFs::exists("units.xml") == true);
-    REQUIRE(VirtFs::exists("units123.xml") == false);
-    REQUIRE(VirtFs::exists("tesQ/units.xml") == false);
-    REQUIRE(VirtFs::exists("units.xml"));
-    REQUIRE(VirtFs::exists("file1.txt") == false);
-    REQUIRE(VirtFs::exists("file2.txt") == false);
-
-    if (dir1 == true)
-    {
-        VirtFs::mountDir2("data//test",
-            "dir2",
-            Append_false);
-    }
-    else
-    {
-        VirtFs::mountDirSilent2("..//data\\test",
-            "dir2",
-            Append_false);
-    }
-
-    REQUIRE(VirtFs::exists("test") == false);
-    REQUIRE(VirtFs::exists("test/") == false);
-    REQUIRE(VirtFs::exists("dir1"));
-    REQUIRE(VirtFs::exists("dir1/"));
-    REQUIRE(VirtFs::exists("dir") == false);
-    REQUIRE(VirtFs::exists("units.xml") == true);
-    REQUIRE(VirtFs::exists("units123.xml") == false);
-    REQUIRE(VirtFs::exists("tesQ/units.xml") == false);
-    REQUIRE(VirtFs::exists("units.xml"));
-    REQUIRE(VirtFs::exists("file1.txt"));
-    REQUIRE(VirtFs::exists("file2.txt"));
-
-    if (dir1 == true)
-        VirtFs::unmountDirSilent2("data/test", "dir2");
-    else
-        VirtFs::unmountDirSilent2("../data/test", "dir2");
-
-    REQUIRE(VirtFs::exists("test") == false);
-    REQUIRE(VirtFs::exists("test/") == false);
-    REQUIRE(VirtFs::exists("dir1"));
-    REQUIRE(VirtFs::exists("dir1/"));
-    REQUIRE(VirtFs::exists("dir") == false);
-    REQUIRE(VirtFs::exists("units.xml") == true);
-    REQUIRE(VirtFs::exists("units123.xml") == false);
-    REQUIRE(VirtFs::exists("tesQ/units.xml") == false);
-    REQUIRE(VirtFs::exists("units.xml"));
-    REQUIRE(VirtFs::exists("file1.txt") == false);
-    REQUIRE(VirtFs::exists("file2.txt") == false);
-
-    VirtFs::deinit();
-}
diff --git a/src/unittests/fs/virtfs/virtfs1_getrealdir.cc b/src/unittests/fs/virtfs/virtfs1_getrealdir.cc
deleted file mode 100644
index ca58a993e..000000000
--- a/src/unittests/fs/virtfs/virtfs1_getrealdir.cc
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2016-2017  The ManaPlus Developers
- *
- *  This file is part of The ManaPlus Client.
- *
- *  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
- *  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, see <http://www.gnu.org/licenses/>.
- */
-
-#include "unittests/unittests.h"
-
-#include "fs/files.h"
-
-#include "fs/virtfs/fs.h"
-
-#include "utils/checkutils.h"
-
-#ifndef UNITTESTS_CATCH
-#include <algorithm>
-#endif  // UNITTESTS_CATCH
-
-#include "debug.h"
-
-TEST_CASE("VirtFs1 getRealDir1", "")
-{
-    VirtFs::init(".");
-    const std::string sep = dirSeparator;
-    REQUIRE(VirtFs::getRealDir(".").empty());
-    REQUIRE(VirtFs::getRealDir("..").empty());
-    const bool dir1 = VirtFs::mountDirSilent("data",
-        Append_false);
-    REQUIRE((dir1 || VirtFs::mountDirSilent("../data",
-        Append_false)) == true);
-    if (dir1 == true)
-    {
-        REQUIRE(VirtFs::getRealDir("test") == "data");
-        REQUIRE(VirtFs::getRealDir("test/test.txt") ==
-            "data");
-        REQUIRE(VirtFs::getRealDir("test\\test.txt") ==
-            "data");
-        REQUIRE(VirtFs::getRealDir("test//test.txt") ==
-            "data");
-    }
-    else
-    {
-        REQUIRE(VirtFs::getRealDir("test") == "../data");
-        REQUIRE(VirtFs::getRealDir("test/test.txt") ==
-            "../data");
-        REQUIRE(VirtFs::getRealDir("test\\test.txt") ==
-            "../data");
-        REQUIRE(VirtFs::getRealDir("test//test.txt") ==
-            "../data");
-    }
-    REQUIRE(VirtFs::getRealDir("zzz").empty());
-
-    VirtFs::mountDirSilent("data/test",
-        Append_false);
-    VirtFs::mountDirSilent("../data/test",
-        Append_false);
-    if (dir1 == true)
-    {
-        REQUIRE(VirtFs::getRealDir("test") == "data");
-        REQUIRE(VirtFs::getRealDir("test/test.txt") ==
-            "data");
-        REQUIRE(VirtFs::getRealDir("test\\test.txt") ==
-            "data");
-        REQUIRE(VirtFs::getRealDir("test.txt") ==
-            "data" + sep + "test");
-    }
-    else
-    {
-        REQUIRE(VirtFs::getRealDir("test") == ".." + sep + "data");
-        REQUIRE(VirtFs::getRealDir("test/test.txt") ==
-            ".." + sep + "data");
-        REQUIRE(VirtFs::getRealDir("test\\test.txt") ==
-            ".." + sep + "data");
-        REQUIRE(VirtFs::getRealDir("test.txt") ==
-            ".." + sep + "data" + sep + "test");
-    }
-    REQUIRE(VirtFs::getRealDir("zzz").empty());
-
-    VirtFs::unmountDirSilent("data/test");
-    VirtFs::unmountDirSilent("../data/test");
-
-    if (dir1 == true)
-    {
-        REQUIRE(VirtFs::getRealDir("test") == "data");
-        REQUIRE(VirtFs::getRealDir("test/test.txt") ==
-            "data");
-    }
-    else
-    {
-        REQUIRE(VirtFs::getRealDir("test") == ".." + sep + "data");
-        REQUIRE(VirtFs::getRealDir("test/test.txt") ==
-            ".." + sep + "data");
-    }
-    REQUIRE(VirtFs::getRealDir("zzz").empty());
-
-    VirtFs::unmountDirSilent("data");
-    VirtFs::unmountDirSilent("../data");
-    VirtFs::deinit();
-}
-
-TEST_CASE("VirtFs1 getRealDir2", "")
-{
-    VirtFs::init(".");
-    const std::string sep = dirSeparator;
-    std::string name("data/test/test.zip");
-    std::string prefix("data" + sep + "test" + sep);
-    if (Files::existsLocal(name) == false)
-        prefix = ".." + sep + prefix;
-    VirtFs::mountZip(prefix + "test2.zip",
-        Append_false);
-
-    REQUIRE(VirtFs::getRealDir(".").empty());
-    REQUIRE(VirtFs::getRealDir("..").empty());
-    REQUIRE(VirtFs::getRealDir("test.txt") == prefix + "test2.zip");
-    REQUIRE(VirtFs::getRealDir("dir/1") == prefix + "test2.zip");
-    REQUIRE(VirtFs::getRealDir("dir\\dye.png") ==
-        prefix + "test2.zip");
-    REQUIRE(VirtFs::getRealDir("zzz").empty());
-
-    VirtFs::mountZip(prefix + "test.zip",
-        Append_false);
-    REQUIRE(VirtFs::getRealDir("dir//dye.png") ==
-        prefix + "test2.zip");
-    REQUIRE(VirtFs::getRealDir("dir///hide.png") ==
-        prefix + "test.zip");
-    REQUIRE(VirtFs::getRealDir("dir\\\\brimmedhat.png") ==
-        prefix + "test.zip");
-    REQUIRE(VirtFs::getRealDir("zzz").empty());
-
-    VirtFs::unmountZip(prefix + "test.zip");
-
-    REQUIRE(VirtFs::getRealDir("dir/brimmedhat.png").empty());
-    REQUIRE(VirtFs::getRealDir("test.txt") == prefix + "test2.zip");
-    REQUIRE(VirtFs::getRealDir("dir//dye.png") ==
-        prefix + "test2.zip");
-    REQUIRE(VirtFs::getRealDir("zzz").empty());
-
-    VirtFs::unmountZip(prefix + "test2.zip");
-    VirtFs::deinit();
-}
-
-TEST_CASE("VirtFs1 getRealDir3", "")
-{
-    VirtFs::init(".");
-    const std::string sep = dirSeparator;
-    REQUIRE(VirtFs::getRealDir(".").empty());
-    REQUIRE(VirtFs::getRealDir("..").empty());
-    const bool dir1 = VirtFs::mountDirSilent2("data",
-        "test",
-        Append_false);
-    REQUIRE((dir1 || VirtFs::mountDirSilent2("../data",
-        "test",
-        Append_false)) == true);
-    REQUIRE(VirtFs::getRealDir("file1.txt").empty());
-    if (dir1 == true)
-    {
-        REQUIRE(VirtFs::getRealDir("dir1") == "data");
-        REQUIRE(VirtFs::getRealDir("simplefile.txt") == "data");
-    }
-    else
-    {
-        REQUIRE(VirtFs::getRealDir("dir1") == ".." + sep + "data");
-        REQUIRE(VirtFs::getRealDir("simplefile.txt") == ".." + sep + "data");
-    }
-    REQUIRE(VirtFs::getRealDir("zzz").empty());
-
-    VirtFs::mountDirSilent2("data/test",
-        "dir2",
-        Append_false);
-    VirtFs::mountDirSilent2("../data/test",
-        "dir2",
-        Append_false);
-    REQUIRE(VirtFs::getRealDir("dir").empty());
-    if (dir1 == true)
-    {
-        REQUIRE(VirtFs::getRealDir("file1.txt") == "data" + sep + "test");
-        REQUIRE(VirtFs::getRealDir("simplefile.txt") == "data");
-    }
-    else
-    {
-        REQUIRE(VirtFs::getRealDir("file1.txt") ==
-            ".." + sep + "data" + sep + "test");
-        REQUIRE(VirtFs::getRealDir("simplefile.txt") == ".." + sep + "data");
-    }
-    REQUIRE(VirtFs::getRealDir("zzz").empty());
-
-    VirtFs::deinit();
-}
diff --git a/src/unittests/fs/virtfs/virtfs1_mountdir1.cc b/src/unittests/fs/virtfs/virtfs1_mountdir1.cc
deleted file mode 100644
index 92d6d037d..000000000
--- a/src/unittests/fs/virtfs/virtfs1_mountdir1.cc
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2016-2017  The ManaPlus Developers
- *
- *  This file is part of The ManaPlus Client.
- *
- *  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
- *  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, see <http://www.gnu.org/licenses/>.
- */
-
-#include "unittests/unittests.h"
-
-#include "fs/virtfs/direntry.h"
-#include "fs/virtfs/fs.h"
-
-#include "utils/checkutils.h"
-
-#ifndef UNITTESTS_CATCH
-#include <algorithm>
-#endif  // UNITTESTS_CATCH
-
-#include "debug.h"
-
-TEST_CASE("VirtFs1 mountDir1", "")
-{
-    VirtFs::init(".");
-    const std::string sep = dirSeparator;
-    SECTION("simple 1")
-    {
-        REQUIRE(VirtFs::mountDirSilentTest("dir1",
-            Append_false));
-        REQUIRE(VirtFs::searchByRootInternal("dir1" + sep, std::string()) !=
-            nullptr);
-        REQUIRE(VirtFs::searchByRootInternal("dir1" + sep, "dir1") ==
-            nullptr);
-        REQUIRE(VirtFs::searchByRootInternal("test" + sep, std::string()) ==
-            nullptr);
-        REQUIRE(VirtFs::getEntries().size() == 1);
-        REQUIRE(VirtFs::getEntries()[0]->root == "dir1" + sep);
-        REQUIRE(VirtFs::getEntries()[0]->subDir.empty());
-        REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Dir);
-        REQUIRE(static_cast<VirtFs::DirEntry*>(
-            VirtFs::getEntries()[0])->userDir == "dir1");
-    }
-
-    SECTION("simple 2")
-    {
-        REQUIRE(VirtFs::mountDirSilentTest("dir1/",
-            Append_true));
-        REQUIRE(VirtFs::searchByRootInternal("dir1" + sep, std::string()) !=
-            nullptr);
-        REQUIRE(VirtFs::searchByRootInternal("dir1" + sep, "dir1") ==
-            nullptr);
-        REQUIRE(VirtFs::searchByRootInternal("test" + sep, std::string()) ==
-            nullptr);
-        REQUIRE(VirtFs::getEntries().size() == 1);
-        REQUIRE(VirtFs::getEntries()[0]->root == "dir1" + sep);
-        REQUIRE(VirtFs::getEntries()[0]->subDir.empty());
-        REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Dir);
-        REQUIRE(static_cast<VirtFs::DirEntry*>(
-            VirtFs::getEntries()[0])->userDir == "dir1" + sep);
-    }
-
-    SECTION("simple 3")
-    {
-        REQUIRE(VirtFs::mountDirSilentTest("dir1",
-            Append_false));
-        REQUIRE(VirtFs::mountDirSilentTest("dir2",
-            Append_false));
-        REQUIRE(VirtFs::searchByRootInternal("dir1" + sep, std::string()) !=
-            nullptr);
-        REQUIRE(VirtFs::searchByRootInternal("dir1" + sep, "dir1") ==
-            nullptr);
-        REQUIRE(VirtFs::searchByRootInternal("dir2" + sep, std::string()) !=
-            nullptr);
-        REQUIRE(VirtFs::searchByRootInternal("test" + sep, std::string()) ==
-            nullptr);
-        REQUIRE(VirtFs::getEntries().size() == 2);
-        REQUIRE(VirtFs::getEntries()[0]->root == "dir2" + sep);
-        REQUIRE(VirtFs::getEntries()[1]->root == "dir1" + sep);
-        REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Dir);
-        REQUIRE(VirtFs::getEntries()[1]->type == FsEntryType::Dir);
-        REQUIRE(VirtFs::getEntries()[0]->subDir.empty());
-        REQUIRE(VirtFs::getEntries()[1]->subDir.empty());
-        REQUIRE(static_cast<VirtFs::DirEntry*>(
-            VirtFs::getEntries()[0])->userDir == "dir2");
-        REQUIRE(static_cast<VirtFs::DirEntry*>(
-            VirtFs::getEntries()[1])->userDir == "dir1");
-    }
-
-    SECTION("simple 4")
-    {
-        REQUIRE(VirtFs::mountDirSilentTest("dir1\\",
-            Append_true));
-        REQUIRE(VirtFs::mountDirSilentTest("dir2",
-            Append_true));
-        REQUIRE(VirtFs::searchByRootInternal("dir1" + sep, std::string()) !=
-            nullptr);
-        REQUIRE(VirtFs::searchByRootInternal("dir2" + sep, std::string()) !=
-            nullptr);
-        REQUIRE(VirtFs::searchByRootInternal("test" + sep, std::string()) ==
-            nullptr);
-        REQUIRE(VirtFs::getEntries().size() == 2);
-        REQUIRE(VirtFs::getEntries()[0]->root == "dir1" + sep);
-        REQUIRE(VirtFs::getEntries()[1]->root == "dir2" + sep);
-        REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Dir);
-        REQUIRE(VirtFs::getEntries()[1]->type == FsEntryType::Dir);
-        REQUIRE(VirtFs::getEntries()[0]->subDir.empty());
-        REQUIRE(VirtFs::getEntries()[1]->subDir.empty());
-        REQUIRE(static_cast<VirtFs::DirEntry*>(
-            VirtFs::getEntries()[0])->userDir == "dir1" + sep);
-        REQUIRE(static_cast<VirtFs::DirEntry*>(
-            VirtFs::getEntries()[1])->userDir == "dir2");
-    }
-
-    SECTION("simple 5")
-    {
-        REQUIRE(VirtFs::mountDirSilentTest("dir1",
-            Append_true));
-        REQUIRE(VirtFs::mountDirSilentTest("dir2",
-            Append_true));
-        REQUIRE(VirtFs::mountDirSilentTest("dir3/test",
-            Append_true));
-        REQUIRE(VirtFs::searchByRootInternal("dir1" + sep, std::string()) !=
-            nullptr);
-        REQUIRE(VirtFs::searchByRootInternal("dir2" + sep, std::string()) !=
-            nullptr);
-        REQUIRE(VirtFs::searchByRootInternal(
-            "dir3" + sep + "test" + sep, std::string()) != nullptr);
-        REQUIRE(VirtFs::searchByRootInternal("test" + sep, std::string()) ==
-            nullptr);
-        REQUIRE(VirtFs::getEntries().size() == 3);
-        REQUIRE(VirtFs::getEntries()[0]->root == "dir1" + sep);
-        REQUIRE(VirtFs::getEntries()[1]->root == "dir2" + sep);
-        REQUIRE(VirtFs::getEntries()[2]->root == "dir3" + sep + "test" + sep);
-        REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Dir);
-        REQUIRE(VirtFs::getEntries()[1]->type == FsEntryType::Dir);
-        REQUIRE(VirtFs::getEntries()[2]->type == FsEntryType::Dir);
-        REQUIRE(VirtFs::getEntries()[0]->subDir.empty());
-        REQUIRE(VirtFs::getEntries()[1]->subDir.empty());
-        REQUIRE(VirtFs::getEntries()[2]->subDir.empty());
-        REQUIRE(static_cast<VirtFs::DirEntry*>(
-            VirtFs::getEntries()[0])->userDir == "dir1");
-        REQUIRE(static_cast<VirtFs::DirEntry*>(
-            VirtFs::getEntries()[1])->userDir == "dir2");
-        REQUIRE(static_cast<VirtFs::DirEntry*>(
-            VirtFs::getEntries()[2])->userDir == "dir3" + sep + "test");
-    }
-
-    SECTION("simple 6")
-    {
-        REQUIRE(VirtFs::mountDirSilentTest("dir1",
-            Append_true));
-        REQUIRE(VirtFs::mountDirSilentTest("dir2",
-            Append_true));
-        REQUIRE(VirtFs::mountDirSilentTest("dir3\\test",
-            Append_false));
-        REQUIRE(VirtFs::searchByRootInternal(
-            "dir1" + sep + "", std::string()) != nullptr);
-        REQUIRE(VirtFs::searchByRootInternal(
-            "dir2" + sep + "", std::string()) != nullptr);
-        REQUIRE(VirtFs::searchByRootInternal(
-            "dir3" + sep + "test" + sep, std::string()) != nullptr);
-        REQUIRE(VirtFs::searchByRootInternal(
-            "test" + sep + "", std::string()) == nullptr);
-        REQUIRE(VirtFs::getEntries().size() == 3);
-        REQUIRE(VirtFs::getEntries()[0]->root == "dir3" + sep + "test" + sep);
-        REQUIRE(VirtFs::getEntries()[1]->root == "dir1" + sep);
-        REQUIRE(VirtFs::getEntries()[2]->root == "dir2" + sep);
-        REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Dir);
-        REQUIRE(VirtFs::getEntries()[1]->type == FsEntryType::Dir);
-        REQUIRE(VirtFs::getEntries()[2]->type == FsEntryType::Dir);
-        REQUIRE(VirtFs::getEntries()[0]->subDir.empty());
-        REQUIRE(VirtFs::getEntries()[1]->subDir.empty());
-        REQUIRE(VirtFs::getEntries()[2]->subDir.empty());
-        REQUIRE(static_cast<VirtFs::DirEntry*>(
-            VirtFs::getEntries()[0])->userDir == "dir3" + sep + "test");
-        REQUIRE(static_cast<VirtFs::DirEntry*>(
-            VirtFs::getEntries()[1])->userDir == "dir1");
-        REQUIRE(static_cast<VirtFs::DirEntry*>(
-            VirtFs::getEntries()[2])->userDir == "dir2");
-    }
-
-    VirtFs::deinit();
-}
diff --git a/src/unittests/fs/virtfs/virtfs1_mountdir2.cc b/src/unittests/fs/virtfs/virtfs1_mountdir2.cc
deleted file mode 100644
index 35900389f..000000000
--- a/src/unittests/fs/virtfs/virtfs1_mountdir2.cc
+++ /dev/null
@@ -1,315 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2016-2017  The ManaPlus Developers
- *
- *  This file is part of The ManaPlus Client.
- *
- *  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
- *  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, see <http://www.gnu.org/licenses/>.
- */
-
-#include "unittests/unittests.h"
-
-#include "fs/virtfs/direntry.h"
-#include "fs/virtfs/fs.h"
-
-#include "utils/checkutils.h"
-
-#ifndef UNITTESTS_CATCH
-#include <algorithm>
-#endif  // UNITTESTS_CATCH
-
-#include "debug.h"
-
-TEST_CASE("VirtFs1 mountDir2", "")
-{
-    VirtFs::init(".");
-    const std::string sep = dirSeparator;
-    SECTION("subDir 1")
-    {
-        REQUIRE(VirtFs::mountDirSilentTest2("dir1",
-            dirSeparator,
-            Append_false));
-        REQUIRE(VirtFs::searchByRootInternal("dir1" + sep, std::string()) !=
-            nullptr);
-        REQUIRE(VirtFs::searchByRootInternal("test" + sep, std::string()) ==
-            nullptr);
-        REQUIRE(VirtFs::getEntries().size() == 1);
-        REQUIRE(VirtFs::getEntries()[0]->root == "dir1" + sep);
-        REQUIRE(VirtFs::getEntries()[0]->subDir.empty());
-        REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Dir);
-        REQUIRE(static_cast<VirtFs::DirEntry*>(
-            VirtFs::getEntries()[0])->userDir == "dir1");
-    }
-
-    SECTION("subDir 1.2")
-    {
-        REQUIRE(VirtFs::mountDirSilentTest2("dir1",
-            "dir2",
-            Append_false));
-        REQUIRE(VirtFs::searchByRootInternal("dir1" + sep, "dir2" + sep) !=
-            nullptr);
-        REQUIRE(VirtFs::searchByRootInternal("dir1" + sep, "dir1" + sep) ==
-            nullptr);
-        REQUIRE(VirtFs::searchByRootInternal("test" + sep, "dir2" + sep) ==
-            nullptr);
-        REQUIRE(VirtFs::getEntries().size() == 1);
-        REQUIRE(VirtFs::getEntries()[0]->root == "dir1" + sep);
-        REQUIRE(VirtFs::getEntries()[0]->subDir == "dir2" + sep);
-        REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Dir);
-        REQUIRE(static_cast<VirtFs::DirEntry*>(
-            VirtFs::getEntries()[0])->userDir == "dir1");
-    }
-
-    SECTION("subDir 2")
-    {
-        REQUIRE(VirtFs::mountDirSilentTest2("dir1/",
-            "dir2",
-            Append_true));
-        REQUIRE(VirtFs::searchByRootInternal("dir1" + sep, "dir2" + sep) !=
-            nullptr);
-        REQUIRE(VirtFs::searchByRootInternal("test" + sep, "dir2" + sep) ==
-            nullptr);
-        REQUIRE(VirtFs::searchByRootInternal("dir1" + sep, "dir1" + sep) ==
-            nullptr);
-        REQUIRE(VirtFs::getEntries().size() == 1);
-        REQUIRE(VirtFs::getEntries()[0]->root == "dir1" + sep);
-        REQUIRE(VirtFs::getEntries()[0]->subDir == "dir2" + sep);
-        REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Dir);
-        REQUIRE(static_cast<VirtFs::DirEntry*>(
-            VirtFs::getEntries()[0])->userDir == "dir1" + sep);
-    }
-
-    SECTION("subDir 3")
-    {
-        REQUIRE(VirtFs::mountDirSilentTest2("dir1",
-            "dir3",
-            Append_false));
-        REQUIRE(VirtFs::mountDirSilentTest2("dir2",
-            "dir4",
-            Append_false));
-        REQUIRE(VirtFs::searchByRootInternal("dir1" + sep, "dir3" + sep) !=
-            nullptr);
-        REQUIRE(VirtFs::searchByRootInternal("dir1" + sep, "dir1" + sep) ==
-            nullptr);
-        REQUIRE(VirtFs::searchByRootInternal("dir2" + sep, "dir4" + sep) !=
-            nullptr);
-        REQUIRE(VirtFs::searchByRootInternal("test" + sep, "dir3" + sep) ==
-            nullptr);
-        REQUIRE(VirtFs::getEntries().size() == 2);
-        REQUIRE(VirtFs::getEntries()[0]->root == "dir2" + sep);
-        REQUIRE(VirtFs::getEntries()[1]->root == "dir1" + sep);
-        REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Dir);
-        REQUIRE(VirtFs::getEntries()[1]->type == FsEntryType::Dir);
-        REQUIRE(VirtFs::getEntries()[0]->subDir == "dir4" + sep);
-        REQUIRE(VirtFs::getEntries()[1]->subDir == "dir3" + sep);
-        REQUIRE(static_cast<VirtFs::DirEntry*>(
-            VirtFs::getEntries()[0])->userDir == "dir2");
-        REQUIRE(static_cast<VirtFs::DirEntry*>(
-            VirtFs::getEntries()[1])->userDir == "dir1");
-    }
-
-    SECTION("subDir 4")
-    {
-        REQUIRE(VirtFs::mountDirSilentTest2("dir1\\",
-            "dir3",
-            Append_true));
-        REQUIRE(VirtFs::mountDirSilentTest2("dir2",
-            "dir4",
-            Append_true));
-        REQUIRE(VirtFs::searchByRootInternal("dir1" + sep, "dir3" + sep) !=
-            nullptr);
-        REQUIRE(VirtFs::searchByRootInternal("dir1" + sep, "dir1" + sep) ==
-            nullptr);
-        REQUIRE(VirtFs::searchByRootInternal("dir2" + sep, "dir4" + sep) !=
-            nullptr);
-        REQUIRE(VirtFs::searchByRootInternal("test" + sep, "dir3" + sep) ==
-            nullptr);
-        REQUIRE(VirtFs::getEntries().size() == 2);
-        REQUIRE(VirtFs::getEntries()[0]->root == "dir1" + sep);
-        REQUIRE(VirtFs::getEntries()[1]->root == "dir2" + sep);
-        REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Dir);
-        REQUIRE(VirtFs::getEntries()[1]->type == FsEntryType::Dir);
-        REQUIRE(VirtFs::getEntries()[0]->subDir == "dir3" + sep);
-        REQUIRE(VirtFs::getEntries()[1]->subDir == "dir4" + sep);
-        REQUIRE(static_cast<VirtFs::DirEntry*>(
-            VirtFs::getEntries()[0])->userDir == "dir1" + sep);
-        REQUIRE(static_cast<VirtFs::DirEntry*>(
-            VirtFs::getEntries()[1])->userDir == "dir2");
-    }
-
-    SECTION("subDir 5")
-    {
-        REQUIRE(VirtFs::mountDirSilentTest2("dir1",
-            "dir3",
-            Append_true));
-        REQUIRE(VirtFs::mountDirSilentTest2("dir2",
-            "dir4",
-            Append_true));
-        REQUIRE(VirtFs::mountDirSilentTest2("dir3/test",
-            "dir5",
-            Append_true));
-        REQUIRE(VirtFs::searchByRootInternal("dir1" + sep, "dir3" + sep) !=
-            nullptr);
-        REQUIRE(VirtFs::searchByRootInternal("dir2" + sep, "dir4" + sep) !=
-            nullptr);
-        REQUIRE(VirtFs::searchByRootInternal(
-            "dir3" + sep + "test" + sep, "dir5" + sep) != nullptr);
-        REQUIRE(VirtFs::searchByRootInternal("test" + sep, "dir3" + sep) ==
-            nullptr);
-        REQUIRE(VirtFs::getEntries().size() == 3);
-        REQUIRE(VirtFs::getEntries()[0]->root == "dir1" + sep);
-        REQUIRE(VirtFs::getEntries()[1]->root == "dir2" + sep);
-        REQUIRE(VirtFs::getEntries()[2]->root == "dir3" + sep + "test" + sep);
-        REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Dir);
-        REQUIRE(VirtFs::getEntries()[1]->type == FsEntryType::Dir);
-        REQUIRE(VirtFs::getEntries()[2]->type == FsEntryType::Dir);
-        REQUIRE(VirtFs::getEntries()[0]->subDir == "dir3" + sep);
-        REQUIRE(VirtFs::getEntries()[1]->subDir == "dir4" + sep);
-        REQUIRE(VirtFs::getEntries()[2]->subDir == "dir5" + sep);
-        REQUIRE(static_cast<VirtFs::DirEntry*>(
-            VirtFs::getEntries()[0])->userDir == "dir1");
-        REQUIRE(static_cast<VirtFs::DirEntry*>(
-            VirtFs::getEntries()[1])->userDir == "dir2");
-        REQUIRE(static_cast<VirtFs::DirEntry*>(
-            VirtFs::getEntries()[2])->userDir == "dir3" + sep + "test");
-    }
-
-    SECTION("subDir 6")
-    {
-        REQUIRE(VirtFs::mountDirSilentTest2("dir1",
-            "dir1",
-            Append_true));
-        REQUIRE(VirtFs::mountDirSilentTest2("dir2",
-            "dir2",
-            Append_true));
-        REQUIRE(VirtFs::mountDirSilentTest2("dir3\\test",
-            "dir3\\test",
-            Append_false));
-        REQUIRE(VirtFs::searchByRootInternal(
-            "dir1" + sep + "", "dir1" + sep) != nullptr);
-        REQUIRE(VirtFs::searchByRootInternal(
-            "dir2" + sep + "", "dir2" + sep) != nullptr);
-        REQUIRE(VirtFs::searchByRootInternal(
-            "dir3" + sep + "test" + sep,
-            "dir3" + sep + "test" + sep) != nullptr);
-        REQUIRE(VirtFs::searchByRootInternal(
-            "test" + sep + "", "dir1" + sep) == nullptr);
-        REQUIRE(VirtFs::getEntries().size() == 3);
-        REQUIRE(VirtFs::getEntries()[0]->root == "dir3" + sep + "test" + sep);
-        REQUIRE(VirtFs::getEntries()[1]->root == "dir1" + sep);
-        REQUIRE(VirtFs::getEntries()[2]->root == "dir2" + sep);
-        REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Dir);
-        REQUIRE(VirtFs::getEntries()[1]->type == FsEntryType::Dir);
-        REQUIRE(VirtFs::getEntries()[2]->type == FsEntryType::Dir);
-        REQUIRE(VirtFs::getEntries()[0]->subDir ==
-            "dir3" + sep + "test" + sep);
-        REQUIRE(VirtFs::getEntries()[1]->subDir == "dir1" + sep);
-        REQUIRE(VirtFs::getEntries()[2]->subDir == "dir2" + sep);
-        REQUIRE(static_cast<VirtFs::DirEntry*>(
-            VirtFs::getEntries()[0])->userDir == "dir3" + sep + "test");
-        REQUIRE(static_cast<VirtFs::DirEntry*>(
-            VirtFs::getEntries()[1])->userDir == "dir1");
-        REQUIRE(static_cast<VirtFs::DirEntry*>(
-            VirtFs::getEntries()[2])->userDir == "dir2");
-    }
-
-    SECTION("subDir 7")
-    {
-        REQUIRE(VirtFs::mountDirSilentTest("dir1",
-            Append_true));
-        REQUIRE(VirtFs::mountDirSilentTest2("dir1",
-            "dir2",
-            Append_true));
-        REQUIRE(VirtFs::searchByRootInternal("dir1" + sep, std::string()) !=
-            nullptr);
-        REQUIRE(VirtFs::searchByRootInternal("dir1" + sep, "dir2" + sep) !=
-            nullptr);
-        REQUIRE(VirtFs::searchByRootInternal("test" + sep, "dir2" + sep) ==
-            nullptr);
-        REQUIRE(VirtFs::getEntries().size() == 2);
-        REQUIRE(VirtFs::getEntries()[0]->root == "dir1" + sep);
-        REQUIRE(VirtFs::getEntries()[0]->subDir.empty());
-        REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Dir);
-        REQUIRE(VirtFs::getEntries()[1]->root == "dir1" + sep);
-        REQUIRE(VirtFs::getEntries()[1]->subDir == "dir2" + sep);
-        REQUIRE(VirtFs::getEntries()[1]->type == FsEntryType::Dir);
-        REQUIRE(static_cast<VirtFs::DirEntry*>(
-            VirtFs::getEntries()[0])->userDir == "dir1");
-        REQUIRE(static_cast<VirtFs::DirEntry*>(
-            VirtFs::getEntries()[1])->userDir == "dir1");
-
-        REQUIRE(VirtFs::unmountDirSilent("dir1"));
-        REQUIRE(VirtFs::getEntries().size() == 1);
-        REQUIRE(VirtFs::getEntries()[0]->root == "dir1" + sep);
-        REQUIRE(VirtFs::getEntries()[0]->subDir == "dir2" + sep);
-        REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Dir);
-        REQUIRE(static_cast<VirtFs::DirEntry*>(
-            VirtFs::getEntries()[0])->userDir == "dir1");
-    }
-
-    SECTION("subDir 8")
-    {
-        REQUIRE(VirtFs::mountDirSilentTest("dir1",
-            Append_true));
-        REQUIRE(VirtFs::mountDirSilentTest2("dir1",
-            "dir2",
-            Append_true));
-        REQUIRE(VirtFs::searchByRootInternal("dir1" + sep, std::string()) !=
-            nullptr);
-        REQUIRE(VirtFs::searchByRootInternal("dir1" + sep, "dir2" + sep) !=
-            nullptr);
-        REQUIRE(VirtFs::searchByRootInternal("test" + sep, "dir2" + sep) ==
-            nullptr);
-        REQUIRE(VirtFs::getEntries().size() == 2);
-        REQUIRE(VirtFs::getEntries()[0]->root == "dir1" + sep);
-        REQUIRE(VirtFs::getEntries()[0]->subDir.empty());
-        REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Dir);
-        REQUIRE(VirtFs::getEntries()[1]->root == "dir1" + sep);
-        REQUIRE(VirtFs::getEntries()[1]->subDir == "dir2" + sep);
-        REQUIRE(VirtFs::getEntries()[1]->type == FsEntryType::Dir);
-        REQUIRE(static_cast<VirtFs::DirEntry*>(
-            VirtFs::getEntries()[0])->userDir == "dir1");
-        REQUIRE(static_cast<VirtFs::DirEntry*>(
-            VirtFs::getEntries()[1])->userDir == "dir1");
-
-        REQUIRE(VirtFs::unmountDirSilent2("dir1", "dir2"));
-        REQUIRE(VirtFs::getEntries().size() == 1);
-        REQUIRE(VirtFs::getEntries()[0]->root == "dir1" + sep);
-        REQUIRE(VirtFs::getEntries()[0]->subDir.empty());
-        REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Dir);
-        REQUIRE(static_cast<VirtFs::DirEntry*>(
-            VirtFs::getEntries()[0])->userDir == "dir1");
-    }
-
-    SECTION("subDir 9")
-    {
-        REQUIRE(VirtFs::mountDirSilentTest2("dir1",
-            dirSeparator,
-            Append_false));
-        REQUIRE(VirtFs::searchByRootInternal("dir1" + sep, std::string()) !=
-            nullptr);
-        REQUIRE(VirtFs::searchByRootInternal("dir1" + sep, "dir1") ==
-            nullptr);
-        REQUIRE(VirtFs::searchByRootInternal("test" + sep, std::string()) ==
-            nullptr);
-        REQUIRE(VirtFs::getEntries().size() == 1);
-        REQUIRE(VirtFs::getEntries()[0]->root == "dir1" + sep);
-        REQUIRE(VirtFs::getEntries()[0]->subDir.empty());
-        REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Dir);
-        REQUIRE(static_cast<VirtFs::DirEntry*>(
-            VirtFs::getEntries()[0])->userDir == "dir1");
-    }
-
-    VirtFs::deinit();
-}
diff --git a/src/unittests/fs/virtfs/virtfs1_mountzip1.cc b/src/unittests/fs/virtfs/virtfs1_mountzip1.cc
deleted file mode 100644
index 09932f0a6..000000000
--- a/src/unittests/fs/virtfs/virtfs1_mountzip1.cc
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2016-2017  The ManaPlus Developers
- *
- *  This file is part of The ManaPlus Client.
- *
- *  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
- *  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, see <http://www.gnu.org/licenses/>.
- */
-
-#include "unittests/unittests.h"
-
-#include "fs/files.h"
-
-#include "fs/virtfs/direntry.h"
-#include "fs/virtfs/fs.h"
-
-#include "utils/checkutils.h"
-
-#ifndef UNITTESTS_CATCH
-#include <algorithm>
-#endif  // UNITTESTS_CATCH
-
-#include "debug.h"
-
-TEST_CASE("VirtFs1 mountZip1", "")
-{
-    VirtFs::init(".");
-    std::string name("data/test/test.zip");
-    std::string prefix;
-    const std::string sep = dirSeparator;
-    if (Files::existsLocal(name) == false)
-        prefix = "../";
-
-    SECTION("simple 1")
-    {
-        REQUIRE(VirtFs::mountZip(prefix + "data/test/test.zip",
-            Append_false));
-        REQUIRE(VirtFs::searchByRootInternal(
-            prefix + "data" + sep + "test" + sep + "test.zip", std::string()) !=
-            nullptr);
-        REQUIRE(VirtFs::searchByRootInternal(
-            prefix + "data" + sep + "test" + sep + "test2.zip",
-            std::string()) == nullptr);
-        REQUIRE(VirtFs::getEntries().size() == 1);
-        REQUIRE(VirtFs::getEntries()[0]->root ==
-            prefix + "data" + sep + "test" + sep + "test.zip");
-        REQUIRE(VirtFs::getEntries()[0]->subDir.empty());
-        REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Zip);
-    }
-
-    SECTION("simple 2")
-    {
-        REQUIRE(VirtFs::mountZip(prefix + "data/test/test.zip",
-            Append_false));
-        REQUIRE(VirtFs::mountZip(prefix + "data/test/test2.zip",
-            Append_false));
-        REQUIRE(VirtFs::searchByRootInternal(
-            prefix + "data" + sep + "test" + sep + "test.zip",
-            std::string()) != nullptr);
-        REQUIRE(VirtFs::searchByRootInternal(
-            prefix + "data" + sep + "test" + sep + "test2.zip",
-            std::string()) != nullptr);
-        REQUIRE(VirtFs::getEntries().size() == 2);
-        REQUIRE(VirtFs::getEntries()[0]->root ==
-            prefix + "data" + sep + "test" + sep + "test2.zip");
-        REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Zip);
-        REQUIRE(VirtFs::getEntries()[0]->subDir.empty());
-        REQUIRE(VirtFs::getEntries()[1]->root ==
-            prefix + "data" + sep + "test" + sep + "test.zip");
-        REQUIRE(VirtFs::getEntries()[1]->type == FsEntryType::Zip);
-        REQUIRE(VirtFs::getEntries()[1]->subDir.empty());
-    }
-
-    SECTION("simple 3")
-    {
-        REQUIRE(VirtFs::mountZip(prefix + "data/test/test.zip",
-            Append_true));
-        REQUIRE(VirtFs::mountZip(prefix + "data/test/test2.zip",
-            Append_true));
-        REQUIRE(VirtFs::searchByRootInternal(
-            prefix + "data" + sep + "test" + sep + "test.zip",
-            std::string()) != nullptr);
-        REQUIRE(VirtFs::searchByRootInternal(
-            prefix + "data" + sep + "test" + sep + "test2.zip",
-            std::string()) != nullptr);
-        REQUIRE(VirtFs::getEntries().size() == 2);
-        REQUIRE(VirtFs::getEntries()[0]->root ==
-            prefix + "data" + sep + "test" + sep + "test.zip");
-        REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Zip);
-        REQUIRE(VirtFs::getEntries()[0]->subDir.empty());
-        REQUIRE(VirtFs::getEntries()[1]->root ==
-            prefix + "data" + sep + "test" + sep + "test2.zip");
-        REQUIRE(VirtFs::getEntries()[1]->type == FsEntryType::Zip);
-        REQUIRE(VirtFs::getEntries()[1]->subDir.empty());
-    }
-
-    SECTION("simple 4")
-    {
-        REQUIRE(VirtFs::mountZip(prefix + "data/test/test.zip",
-            Append_false));
-        REQUIRE(VirtFs::mountDir(prefix + "data/test",
-            Append_false));
-        REQUIRE(VirtFs::mountZip(prefix + "data/test/test2.zip",
-            Append_false));
-        REQUIRE(VirtFs::searchByRootInternal(
-            prefix + "data" + sep + "test" + sep + "test.zip",
-            std::string()) != nullptr);
-        REQUIRE(VirtFs::searchByRootInternal(
-            prefix + "data" + sep + "test" + sep + "test2.zip",
-            std::string()) != nullptr);
-        REQUIRE(VirtFs::searchByRootInternal(
-            prefix + "data" + sep + "test" + sep + "",
-            std::string()) != nullptr);
-        REQUIRE(VirtFs::getEntries().size() == 3);
-        REQUIRE(VirtFs::getEntries()[0]->root ==
-            prefix + "data" + sep + "test" + sep + "test2.zip");
-        REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Zip);
-        REQUIRE(VirtFs::getEntries()[0]->subDir.empty());
-        REQUIRE(VirtFs::getEntries()[1]->root ==
-            prefix + "data" + sep + "test" + sep + "");
-        REQUIRE(VirtFs::getEntries()[1]->type == FsEntryType::Dir);
-        REQUIRE(VirtFs::getEntries()[1]->subDir.empty());
-        REQUIRE(VirtFs::getEntries()[2]->root ==
-            prefix + "data" + sep + "test" + sep + "test.zip");
-        REQUIRE(VirtFs::getEntries()[2]->type == FsEntryType::Zip);
-        REQUIRE(VirtFs::getEntries()[2]->subDir.empty());
-    }
-
-    SECTION("simple 5")
-    {
-        REQUIRE(VirtFs::mountZip(prefix + "data/test/test.zip",
-            Append_false));
-        REQUIRE(VirtFs::mountDir(prefix + "data/test",
-            Append_false));
-        REQUIRE(VirtFs::mountZip(prefix + "data/test/test2.zip",
-            Append_true));
-        REQUIRE(VirtFs::searchByRootInternal(
-            prefix + "data" + sep + "test" + sep + "test.zip",
-            std::string()) != nullptr);
-        REQUIRE(VirtFs::searchByRootInternal(
-            prefix + "data" + sep + "test" + sep + "test2.zip",
-            std::string()) != nullptr);
-        REQUIRE(VirtFs::searchByRootInternal(
-            prefix + "data" + sep + "test" + sep + "",
-            std::string()) != nullptr);
-        REQUIRE(VirtFs::getEntries().size() == 3);
-        REQUIRE(VirtFs::getEntries()[0]->root ==
-            prefix + "data" + sep + "test" + sep + "");
-        REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Dir);
-        REQUIRE(VirtFs::getEntries()[0]->subDir.empty());
-        REQUIRE(VirtFs::getEntries()[1]->root ==
-            prefix + "data" + sep + "test" + sep + "test.zip");
-        REQUIRE(VirtFs::getEntries()[1]->type == FsEntryType::Zip);
-        REQUIRE(VirtFs::getEntries()[1]->subDir.empty());
-        REQUIRE(VirtFs::getEntries()[2]->root ==
-            prefix + "data" + sep + "test" + sep + "test2.zip");
-        REQUIRE(VirtFs::getEntries()[2]->type == FsEntryType::Zip);
-        REQUIRE(VirtFs::getEntries()[2]->subDir.empty());
-    }
-
-    VirtFs::deinit();
-}
diff --git a/src/unittests/fs/virtfs/virtfs1_mountzip2.cc b/src/unittests/fs/virtfs/virtfs1_mountzip2.cc
deleted file mode 100644
index c9415e007..000000000
--- a/src/unittests/fs/virtfs/virtfs1_mountzip2.cc
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2016-2017  The ManaPlus Developers
- *
- *  This file is part of The ManaPlus Client.
- *
- *  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
- *  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, see <http://www.gnu.org/licenses/>.
- */
-
-#include "unittests/unittests.h"
-
-#include "fs/files.h"
-
-#include "fs/virtfs/direntry.h"
-#include "fs/virtfs/fs.h"
-
-#include "utils/checkutils.h"
-
-#ifndef UNITTESTS_CATCH
-#include <algorithm>
-#endif  // UNITTESTS_CATCH
-
-#include "debug.h"
-
-TEST_CASE("VirtFs1 mountZip2", "")
-{
-    VirtFs::init(".");
-    std::string name("data/test/test.zip");
-    std::string prefix;
-    const std::string sep = dirSeparator;
-    if (Files::existsLocal(name) == false)
-        prefix = "../";
-
-    SECTION("subDir 1")
-    {
-        REQUIRE(VirtFs::mountZip2(prefix + "data/test/test.zip",
-            "dir1",
-            Append_false));
-        REQUIRE(VirtFs::searchByRootInternal(
-            prefix + "data" + sep + "test" + sep + "test.zip", "dir1" + sep) !=
-            nullptr);
-        REQUIRE(VirtFs::searchByRootInternal(
-            prefix + "data" + sep + "test" + sep + "test2.zip",
-            std::string()) == nullptr);
-        REQUIRE(VirtFs::getEntries().size() == 1);
-        REQUIRE(VirtFs::getEntries()[0]->root ==
-            prefix + "data" + sep + "test" + sep + "test.zip");
-        REQUIRE(VirtFs::getEntries()[0]->subDir == "dir1" + sep);
-        REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Zip);
-    }
-
-    SECTION("subDir 2")
-    {
-        REQUIRE(VirtFs::mountZip2(prefix + "data/test/test.zip",
-            "dir1",
-            Append_false));
-        REQUIRE(VirtFs::mountZip2(prefix + "data/test/test2.zip",
-            "dir2",
-            Append_false));
-        REQUIRE(VirtFs::searchByRootInternal(
-            prefix + "data" + sep + "test" + sep + "test.zip", "dir1" + sep) !=
-            nullptr);
-        REQUIRE(VirtFs::searchByRootInternal(
-            prefix + "data" + sep + "test" + sep + "test2.zip",
-            "dir2" + sep) != nullptr);
-        REQUIRE(VirtFs::getEntries().size() == 2);
-        REQUIRE(VirtFs::getEntries()[0]->root ==
-            prefix + "data" + sep + "test" + sep + "test2.zip");
-        REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Zip);
-        REQUIRE(VirtFs::getEntries()[0]->subDir == "dir2" + sep);
-        REQUIRE(VirtFs::getEntries()[1]->root ==
-            prefix + "data" + sep + "test" + sep + "test.zip");
-        REQUIRE(VirtFs::getEntries()[1]->type == FsEntryType::Zip);
-        REQUIRE(VirtFs::getEntries()[1]->subDir == "dir1" + sep);
-    }
-
-    SECTION("subDir 3")
-    {
-        REQUIRE(VirtFs::mountZip2(prefix + "data/test/test.zip",
-            "dir1",
-            Append_true));
-        REQUIRE(VirtFs::mountZip2(prefix + "data/test/test2.zip",
-            "dir2",
-            Append_true));
-        REQUIRE(VirtFs::searchByRootInternal(
-            prefix + "data" + sep + "test" + sep + "test.zip",
-            "dir1" + sep) != nullptr);
-        REQUIRE(VirtFs::searchByRootInternal(
-            prefix + "data" + sep + "test" + sep + "test2.zip",
-            "dir2" + sep) != nullptr);
-        REQUIRE(VirtFs::getEntries().size() == 2);
-        REQUIRE(VirtFs::getEntries()[0]->root ==
-            prefix + "data" + sep + "test" + sep + "test.zip");
-        REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Zip);
-        REQUIRE(VirtFs::getEntries()[0]->subDir == "dir1" + sep);
-        REQUIRE(VirtFs::getEntries()[1]->root ==
-            prefix + "data" + sep + "test" + sep + "test2.zip");
-        REQUIRE(VirtFs::getEntries()[1]->type == FsEntryType::Zip);
-        REQUIRE(VirtFs::getEntries()[1]->subDir == "dir2" + sep);
-    }
-
-    SECTION("subDir 4")
-    {
-        REQUIRE(VirtFs::mountZip2(prefix + "data/test/test.zip",
-            "dir1",
-            Append_false));
-        REQUIRE(VirtFs::mountDir2(prefix + "data/test",
-            "dir2",
-            Append_false));
-        REQUIRE(VirtFs::mountZip2(prefix + "data/test/test2.zip",
-            "dir3",
-            Append_false));
-        REQUIRE(VirtFs::searchByRootInternal(
-            prefix + "data" + sep + "test" + sep + "test.zip",
-            "dir1" + sep) != nullptr);
-        REQUIRE(VirtFs::searchByRootInternal(
-            prefix + "data" + sep + "test" + sep + "test2.zip",
-            "dir3" + sep) != nullptr);
-        REQUIRE(VirtFs::searchByRootInternal(
-            prefix + "data" + sep + "test" + sep + "",
-            "dir2" + sep) != nullptr);
-        REQUIRE(VirtFs::getEntries().size() == 3);
-        REQUIRE(VirtFs::getEntries()[0]->root ==
-            prefix + "data" + sep + "test" + sep + "test2.zip");
-        REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Zip);
-        REQUIRE(VirtFs::getEntries()[0]->subDir == "dir3" + sep);
-        REQUIRE(VirtFs::getEntries()[1]->root ==
-            prefix + "data" + sep + "test" + sep + "");
-        REQUIRE(VirtFs::getEntries()[1]->type == FsEntryType::Dir);
-        REQUIRE(VirtFs::getEntries()[1]->subDir == "dir2" + sep);
-        REQUIRE(VirtFs::getEntries()[2]->root ==
-            prefix + "data" + sep + "test" + sep + "test.zip");
-        REQUIRE(VirtFs::getEntries()[2]->type == FsEntryType::Zip);
-        REQUIRE(VirtFs::getEntries()[2]->subDir == "dir1" + sep);
-    }
-
-    SECTION("subDir 5")
-    {
-        REQUIRE(VirtFs::mountZip2(prefix + "data/test/test.zip",
-            "dir1",
-            Append_false));
-        REQUIRE(VirtFs::mountDir2(prefix + "data/test",
-            "dir2",
-            Append_false));
-        REQUIRE(VirtFs::mountZip2(prefix + "data/test/test2.zip",
-            "dir3",
-            Append_true));
-        REQUIRE(VirtFs::searchByRootInternal(
-            prefix + "data" + sep + "test" + sep + "test.zip",
-            "dir1" + sep) != nullptr);
-        REQUIRE(VirtFs::searchByRootInternal(
-            prefix + "data" + sep + "test" + sep + "test2.zip",
-            "dir3" + sep) != nullptr);
-        REQUIRE(VirtFs::searchByRootInternal(
-            prefix + "data" + sep + "test" + sep + "",
-            "dir2" + sep) != nullptr);
-        REQUIRE(VirtFs::getEntries().size() == 3);
-        REQUIRE(VirtFs::getEntries()[0]->root ==
-            prefix + "data" + sep + "test" + sep + "");
-        REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Dir);
-        REQUIRE(VirtFs::getEntries()[0]->subDir == "dir2" + sep);
-        REQUIRE(VirtFs::getEntries()[1]->root ==
-            prefix + "data" + sep + "test" + sep + "test.zip");
-        REQUIRE(VirtFs::getEntries()[1]->type == FsEntryType::Zip);
-        REQUIRE(VirtFs::getEntries()[1]->subDir == "dir1" + sep);
-        REQUIRE(VirtFs::getEntries()[2]->root ==
-            prefix + "data" + sep + "test" + sep + "test2.zip");
-        REQUIRE(VirtFs::getEntries()[2]->type == FsEntryType::Zip);
-        REQUIRE(VirtFs::getEntries()[2]->subDir == "dir3" + sep);
-    }
-
-    SECTION("subDir 6")
-    {
-        REQUIRE(VirtFs::mountZip2(prefix + "data/test/test.zip",
-            dirSeparator,
-            Append_false));
-        REQUIRE(VirtFs::searchByRootInternal(
-            prefix + "data" + sep + "test" + sep + "test.zip",
-            std::string()) != nullptr);
-        REQUIRE(VirtFs::searchByRootInternal(
-            prefix + "data" + sep + "test" + sep + "test2.zip",
-            std::string()) == nullptr);
-        REQUIRE(VirtFs::getEntries().size() == 1);
-        REQUIRE(VirtFs::getEntries()[0]->root ==
-            prefix + "data" + sep + "test" + sep + "test.zip");
-        REQUIRE(VirtFs::getEntries()[0]->subDir.empty());
-        REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Zip);
-    }
-
-    VirtFs::deinit();
-}
diff --git a/src/unittests/fs/virtfs/virtfs1_unmount.cc b/src/unittests/fs/virtfs/virtfs1_unmount.cc
deleted file mode 100644
index b1c7a1033..000000000
--- a/src/unittests/fs/virtfs/virtfs1_unmount.cc
+++ /dev/null
@@ -1,377 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2016-2017  The ManaPlus Developers
- *
- *  This file is part of The ManaPlus Client.
- *
- *  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
- *  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, see <http://www.gnu.org/licenses/>.
- */
-
-#include "unittests/unittests.h"
-
-#include "fs/files.h"
-
-#include "fs/virtfs/direntry.h"
-#include "fs/virtfs/fs.h"
-
-#include "utils/checkutils.h"
-
-#ifndef UNITTESTS_CATCH
-#include <algorithm>
-#endif  // UNITTESTS_CATCH
-
-#include "debug.h"
-
-TEST_CASE("VirtFs1 unmount", "")
-{
-    VirtFs::init(".");
-    std::string name("data/test/test.zip");
-    std::string prefix;
-    const std::string sep = dirSeparator;
-    if (Files::existsLocal(name) == false)
-        prefix = "../";
-
-    SECTION("simple 2")
-    {
-        REQUIRE(VirtFs::mountDirSilentTest("dir1",
-            Append_true));
-        REQUIRE(VirtFs::unmountDir("dir1"));
-    }
-
-    SECTION("simple 3")
-    {
-        REQUIRE(VirtFs::mountDirSilentTest("dir1",
-            Append_true));
-        REQUIRE(VirtFs::mountDirSilentTest("dir2//dir3",
-            Append_true));
-        REQUIRE(VirtFs::mountDirSilentTest("dir3",
-            Append_false));
-        REQUIRE(VirtFs::getEntries().size() == 3);
-        REQUIRE(VirtFs::unmountDir("dir1"));
-        REQUIRE(VirtFs::getEntries().size() == 2);
-        REQUIRE(VirtFs::getEntries()[0]->root == "dir3" + sep);
-        REQUIRE(VirtFs::getEntries()[0]->subDir.empty());
-        REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Dir);
-        REQUIRE(static_cast<VirtFs::DirEntry*>(
-            VirtFs::getEntries()[0])->userDir == "dir3");
-        REQUIRE(VirtFs::getEntries()[1]->root == "dir2" + sep + "dir3" + sep);
-        REQUIRE(VirtFs::getEntries()[0]->subDir.empty());
-        REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Dir);
-        REQUIRE(static_cast<VirtFs::DirEntry*>(
-            VirtFs::getEntries()[1])->userDir == "dir2" + sep + "dir3");
-        REQUIRE(VirtFs::getEntries().size() == 2);
-        REQUIRE(VirtFs::getEntries()[0]->root == "dir3" + sep);
-        REQUIRE(VirtFs::getEntries()[0]->subDir.empty());
-        REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Dir);
-        REQUIRE(static_cast<VirtFs::DirEntry*>(
-            VirtFs::getEntries()[0])->userDir == "dir3");
-        REQUIRE(VirtFs::getEntries()[1]->root == "dir2" + sep + "dir3" + sep);
-        REQUIRE(VirtFs::getEntries()[0]->subDir.empty());
-        REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Dir);
-        REQUIRE(static_cast<VirtFs::DirEntry*>(
-            VirtFs::getEntries()[1])->userDir == "dir2" + sep + "dir3");
-        REQUIRE(VirtFs::unmountDir("dir2/dir3"));
-        REQUIRE(VirtFs::getEntries().size() == 1);
-        REQUIRE(VirtFs::getEntries()[0]->root == "dir3" + sep);
-        REQUIRE(VirtFs::getEntries()[0]->subDir.empty());
-        REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Dir);
-        REQUIRE(static_cast<VirtFs::DirEntry*>(
-            VirtFs::getEntries()[0])->userDir == "dir3");
-    }
-
-    SECTION("simple 4")
-    {
-        REQUIRE(VirtFs::mountDirSilentTest("dir1",
-            Append_true));
-        REQUIRE(VirtFs::getEntries().size() == 1);
-        REQUIRE(VirtFs::getEntries()[0]->root == "dir1" + sep);
-        REQUIRE(VirtFs::getEntries()[0]->subDir.empty());
-        REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Dir);
-        REQUIRE(static_cast<VirtFs::DirEntry*>(
-            VirtFs::getEntries()[0])->userDir == "dir1");
-        REQUIRE(VirtFs::unmountDir("dir1"));
-        REQUIRE(VirtFs::getEntries().empty());
-        REQUIRE(VirtFs::mountDirSilentTest("dir1",
-            Append_true));
-        REQUIRE(VirtFs::getEntries().size() == 1);
-        REQUIRE(VirtFs::getEntries()[0]->root == "dir1" + sep);
-        REQUIRE(VirtFs::getEntries()[0]->subDir.empty());
-        REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Dir);
-        REQUIRE(static_cast<VirtFs::DirEntry*>(
-            VirtFs::getEntries()[0])->userDir == "dir1");
-    }
-
-    SECTION("simple 5")
-    {
-        REQUIRE(VirtFs::mountZip(prefix + "data/test/test.zip",
-            Append_true));
-        REQUIRE(VirtFs::mountZip(prefix + "data/test/test2.zip",
-            Append_true));
-        REQUIRE(VirtFs::searchByRootInternal(
-            prefix + "data" + sep + "test" + sep + "test.zip",
-            std::string()) != nullptr);
-        REQUIRE(VirtFs::searchByRootInternal(
-            prefix + "data" + sep + "test" + sep + "test2.zip",
-            std::string()) != nullptr);
-        REQUIRE(VirtFs::getEntries().size() == 2);
-        REQUIRE(VirtFs::getEntries()[0]->root ==
-            prefix + "data" + sep + "test" + sep + "test.zip");
-        REQUIRE(VirtFs::getEntries()[0]->subDir.empty());
-        REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Zip);
-        REQUIRE(VirtFs::getEntries()[1]->root ==
-            prefix + "data" + sep + "test" + sep + "test2.zip");
-        REQUIRE(VirtFs::getEntries()[1]->subDir.empty());
-        REQUIRE(VirtFs::getEntries()[1]->type == FsEntryType::Zip);
-
-        VirtFs::unmountZip(prefix + "data/test/test.zip");
-        REQUIRE(VirtFs::searchByRootInternal(
-            prefix + "data" + sep + "test" + sep + "test.zip",
-            std::string()) == nullptr);
-        REQUIRE(VirtFs::searchByRootInternal(
-            prefix + "data" + sep + "test" + sep + "test2.zip",
-            std::string()) != nullptr);
-        REQUIRE(VirtFs::getEntries().size() == 1);
-        REQUIRE(VirtFs::getEntries()[0]->root ==
-            prefix + "data" + sep + "test" + sep + "test2.zip");
-        REQUIRE(VirtFs::getEntries()[0]->subDir.empty());
-        REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Zip);
-    }
-
-    SECTION("simple 6")
-    {
-        REQUIRE(VirtFs::mountZip(prefix + "data/test/test.zip",
-            Append_false));
-        REQUIRE(VirtFs::mountDir(prefix + "data/test",
-            Append_false));
-        REQUIRE(VirtFs::mountZip(prefix + "data\\test/test2.zip",
-            Append_false));
-
-        REQUIRE(VirtFs::searchByRootInternal(
-            prefix + "data" + sep + "test" + sep + "test.zip",
-            std::string()) != nullptr);
-        REQUIRE(VirtFs::searchByRootInternal(
-            prefix + "data" + sep + "test" + sep + "test2.zip",
-            std::string()) != nullptr);
-        REQUIRE(VirtFs::searchByRootInternal(
-            prefix + "data" + sep + "test" + sep + "",
-            std::string()) != nullptr);
-        REQUIRE(VirtFs::getEntries().size() == 3);
-        REQUIRE(VirtFs::getEntries()[0]->root ==
-            prefix + "data" + sep + "test" + sep + "test2.zip");
-        REQUIRE(VirtFs::getEntries()[0]->subDir.empty());
-        REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Zip);
-        REQUIRE(VirtFs::getEntries()[1]->root ==
-            prefix + "data" + sep + "test" + sep);
-        REQUIRE(VirtFs::getEntries()[1]->subDir.empty());
-        REQUIRE(VirtFs::getEntries()[1]->type == FsEntryType::Dir);
-        REQUIRE(VirtFs::getEntries()[2]->root ==
-            prefix + "data" + sep + "test" + sep + "test.zip");
-        REQUIRE(VirtFs::getEntries()[2]->subDir.empty());
-        REQUIRE(VirtFs::getEntries()[2]->type == FsEntryType::Zip);
-
-        VirtFs::unmountZip(prefix + "data/test/test.zip");
-        REQUIRE(VirtFs::searchByRootInternal(
-            prefix + "data" + sep + "test" + sep + "test.zip",
-            std::string()) == nullptr);
-        REQUIRE(VirtFs::searchByRootInternal(
-            prefix + "data" + sep + "test" + sep + "test2.zip",
-            std::string()) != nullptr);
-        REQUIRE(VirtFs::searchByRootInternal(
-            prefix + "data" + sep + "test" + sep + "",
-            std::string()) != nullptr);
-        REQUIRE(VirtFs::getEntries().size() == 2);
-        REQUIRE(VirtFs::getEntries()[0]->root ==
-            prefix + "data" + sep + "test" + sep + "test2.zip");
-        REQUIRE(VirtFs::getEntries()[0]->subDir.empty());
-        REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Zip);
-        REQUIRE(VirtFs::getEntries()[1]->root ==
-            prefix + "data" + sep + "test" + sep);
-        REQUIRE(VirtFs::getEntries()[1]->subDir.empty());
-        REQUIRE(VirtFs::getEntries()[1]->type == FsEntryType::Dir);
-    }
-
-    SECTION("subDir 2")
-    {
-        REQUIRE(VirtFs::mountDirSilentTest2("dir1",
-            "dir2",
-            Append_true));
-        REQUIRE(VirtFs::unmountDir2("dir1", "dir2"));
-    }
-
-    SECTION("subDir 3")
-    {
-        REQUIRE(VirtFs::mountDirSilentTest2("dir1",
-            "dir2",
-            Append_true));
-        REQUIRE(VirtFs::mountDirSilentTest("dir2//dir3",
-            Append_true));
-        REQUIRE(VirtFs::mountDirSilentTest2("dir3",
-            "dir4",
-            Append_false));
-        REQUIRE(VirtFs::getEntries().size() == 3);
-        REQUIRE(VirtFs::unmountDir2("dir1", "dir2"));
-        REQUIRE(VirtFs::getEntries().size() == 2);
-        REQUIRE(VirtFs::getEntries()[0]->root == "dir3" + sep);
-        REQUIRE(VirtFs::getEntries()[0]->subDir == "dir4" + sep);
-        REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Dir);
-        REQUIRE(static_cast<VirtFs::DirEntry*>(
-            VirtFs::getEntries()[0])->userDir == "dir3");
-        REQUIRE(VirtFs::getEntries()[1]->root == "dir2" + sep + "dir3" + sep);
-        REQUIRE(VirtFs::getEntries()[1]->subDir.empty());
-        REQUIRE(VirtFs::getEntries()[1]->type == FsEntryType::Dir);
-        REQUIRE(static_cast<VirtFs::DirEntry*>(
-            VirtFs::getEntries()[1])->userDir == "dir2" + sep + "dir3");
-        REQUIRE(VirtFs::getEntries().size() == 2);
-        REQUIRE(VirtFs::getEntries()[0]->root == "dir3" + sep);
-        REQUIRE(VirtFs::getEntries()[0]->subDir == "dir4" + sep);
-        REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Dir);
-        REQUIRE(static_cast<VirtFs::DirEntry*>(
-            VirtFs::getEntries()[0])->userDir == "dir3");
-        REQUIRE(VirtFs::getEntries()[1]->root == "dir2" + sep + "dir3" + sep);
-        REQUIRE(VirtFs::getEntries()[1]->subDir.empty());
-        REQUIRE(VirtFs::getEntries()[1]->type == FsEntryType::Dir);
-        REQUIRE(static_cast<VirtFs::DirEntry*>(
-            VirtFs::getEntries()[1])->userDir == "dir2" + sep + "dir3");
-        REQUIRE(VirtFs::unmountDir("dir2/dir3"));
-        REQUIRE(VirtFs::getEntries().size() == 1);
-        REQUIRE(VirtFs::getEntries()[0]->root == "dir3" + sep);
-        REQUIRE(VirtFs::getEntries()[0]->subDir == "dir4" + sep);
-        REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Dir);
-        REQUIRE(static_cast<VirtFs::DirEntry*>(
-            VirtFs::getEntries()[0])->userDir == "dir3");
-    }
-
-    SECTION("subDir 4")
-    {
-        REQUIRE(VirtFs::mountDirSilentTest2("dir1",
-            "dir2",
-            Append_true));
-        REQUIRE(VirtFs::getEntries().size() == 1);
-        REQUIRE(VirtFs::getEntries()[0]->root == "dir1" + sep);
-        REQUIRE(VirtFs::getEntries()[0]->subDir == "dir2" + sep);
-        REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Dir);
-        REQUIRE(static_cast<VirtFs::DirEntry*>(
-            VirtFs::getEntries()[0])->userDir == "dir1");
-        REQUIRE(VirtFs::unmountDir2("dir1", "dir2"));
-        REQUIRE(VirtFs::getEntries().empty());
-        REQUIRE(VirtFs::mountDirSilentTest2("dir1",
-            "dir3",
-            Append_true));
-        REQUIRE(VirtFs::getEntries().size() == 1);
-        REQUIRE(VirtFs::getEntries()[0]->root == "dir1" + sep);
-        REQUIRE(VirtFs::getEntries()[0]->subDir == "dir3" + sep);
-        REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Dir);
-        REQUIRE(static_cast<VirtFs::DirEntry*>(
-            VirtFs::getEntries()[0])->userDir == "dir1");
-    }
-
-    SECTION("subDir 5")
-    {
-        REQUIRE(VirtFs::mountZip2(prefix + "data/test/test.zip",
-            "dir1",
-            Append_true));
-        REQUIRE(VirtFs::mountZip2(prefix + "data/test/test2.zip",
-            "dir2",
-            Append_true));
-
-        REQUIRE(VirtFs::searchByRootInternal(
-            prefix + "data" + sep + "test" + sep + "test.zip",
-            "dir1" + sep) != nullptr);
-        REQUIRE(VirtFs::searchByRootInternal(
-            prefix + "data" + sep + "test" + sep + "test2.zip",
-            "dir2" + sep) != nullptr);
-        REQUIRE(VirtFs::getEntries().size() == 2);
-        REQUIRE(VirtFs::getEntries()[0]->root ==
-            prefix + "data" + sep + "test" + sep + "test.zip");
-        REQUIRE(VirtFs::getEntries()[0]->subDir == "dir1" + sep);
-        REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Zip);
-        REQUIRE(VirtFs::getEntries()[1]->root ==
-            prefix + "data" + sep + "test" + sep + "test2.zip");
-        REQUIRE(VirtFs::getEntries()[1]->subDir == "dir2" + sep);
-        REQUIRE(VirtFs::getEntries()[1]->type == FsEntryType::Zip);
-
-        VirtFs::unmountZip2(prefix + "data/test/test.zip",
-            "dir1");
-        REQUIRE(VirtFs::searchByRootInternal(
-            prefix + "data" + sep + "test" + sep + "test.zip",
-            std::string()) == nullptr);
-        REQUIRE(VirtFs::searchByRootInternal(
-            prefix + "data" + sep + "test" + sep + "test2.zip",
-            "dir2" + sep) != nullptr);
-        REQUIRE(VirtFs::getEntries().size() == 1);
-        REQUIRE(VirtFs::getEntries()[0]->root ==
-            prefix + "data" + sep + "test" + sep + "test2.zip");
-        REQUIRE(VirtFs::getEntries()[0]->subDir == "dir2" + sep);
-        REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Zip);
-    }
-
-    SECTION("subDir 6")
-    {
-        REQUIRE(VirtFs::mountZip2(prefix + "data/test/test.zip",
-            "dir1",
-            Append_false));
-        REQUIRE(VirtFs::mountDir2(prefix + "data/test",
-            "dir2",
-            Append_false));
-        REQUIRE(VirtFs::mountZip2(prefix + "data\\test/test2.zip",
-            "dir3",
-            Append_false));
-
-        REQUIRE(VirtFs::searchByRootInternal(
-            prefix + "data" + sep + "test" + sep + "test.zip",
-            "dir1" + sep) != nullptr);
-        REQUIRE(VirtFs::searchByRootInternal(
-            prefix + "data" + sep + "test" + sep + "test2.zip",
-            "dir3" + sep) != nullptr);
-        REQUIRE(VirtFs::searchByRootInternal(
-            prefix + "data" + sep + "test" + sep + "",
-            "dir2" + sep) != nullptr);
-        REQUIRE(VirtFs::getEntries().size() == 3);
-        REQUIRE(VirtFs::getEntries()[0]->root ==
-            prefix + "data" + sep + "test" + sep + "test2.zip");
-        REQUIRE(VirtFs::getEntries()[0]->subDir == "dir3" + sep);
-        REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Zip);
-        REQUIRE(VirtFs::getEntries()[1]->root ==
-            prefix + "data" + sep + "test" + sep);
-        REQUIRE(VirtFs::getEntries()[1]->subDir == "dir2" + sep);
-        REQUIRE(VirtFs::getEntries()[1]->type == FsEntryType::Dir);
-        REQUIRE(VirtFs::getEntries()[2]->root ==
-            prefix + "data" + sep + "test" + sep + "test.zip");
-        REQUIRE(VirtFs::getEntries()[2]->subDir == "dir1" + sep);
-        REQUIRE(VirtFs::getEntries()[2]->type == FsEntryType::Zip);
-
-        VirtFs::unmountZip2(prefix + "data/test/test.zip",
-            "dir1");
-        REQUIRE(VirtFs::searchByRootInternal(
-            prefix + "data" + sep + "test" + sep + "test.zip",
-            "dir1" + sep) == nullptr);
-        REQUIRE(VirtFs::searchByRootInternal(
-            prefix + "data" + sep + "test" + sep + "test2.zip",
-            "dir3" + sep) != nullptr);
-        REQUIRE(VirtFs::searchByRootInternal(
-            prefix + "data" + sep + "test" + sep + "",
-            "dir2" + sep) != nullptr);
-        REQUIRE(VirtFs::getEntries().size() == 2);
-        REQUIRE(VirtFs::getEntries()[0]->root ==
-            prefix + "data" + sep + "test" + sep + "test2.zip");
-        REQUIRE(VirtFs::getEntries()[0]->subDir == "dir3" + sep);
-        REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Zip);
-        REQUIRE(VirtFs::getEntries()[1]->root ==
-            prefix + "data" + sep + "test" + sep);
-        REQUIRE(VirtFs::getEntries()[1]->subDir == "dir2" + sep);
-        REQUIRE(VirtFs::getEntries()[1]->type == FsEntryType::Dir);
-    }
-
-    VirtFs::deinit();
-}
diff --git a/src/unittests/fs/virtfs/virtfs2.cc b/src/unittests/fs/virtfs/virtfs2.cc
deleted file mode 100644
index a1a1050aa..000000000
--- a/src/unittests/fs/virtfs/virtfs2.cc
+++ /dev/null
@@ -1,1643 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2016-2017  The ManaPlus Developers
- *
- *  This file is part of The ManaPlus Client.
- *
- *  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
- *  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, see <http://www.gnu.org/licenses/>.
- */
-
-#include "unittests/unittests.h"
-
-#include "fs/files.h"
-
-#include "fs/virtfs/fs.h"
-#include "fs/virtfs/rwops.h"
-
-#include "utils/checkutils.h"
-#include "utils/foreach.h"
-#include "utils/stringutils.h"
-
-PRAGMA48(GCC diagnostic push)
-PRAGMA48(GCC diagnostic ignored "-Wshadow")
-#include <SDL_rwops.h>
-PRAGMA48(GCC diagnostic pop)
-
-#ifndef UNITTESTS_CATCH
-#include <algorithm>
-#endif  // UNITTESTS_CATCH
-
-#include "debug.h"
-
-static bool inList(StringVect list,
-                   const std::string &name)
-{
-    FOR_EACH (StringVectCIter, it, list)
-    {
-        if (*it == name)
-            return true;
-    }
-    return false;
-}
-
-static bool inList(StringVect list,
-                   const std::string &dir,
-                   const std::string &name)
-{
-    const std::string path = pathJoin(dir, name);
-    FOR_EACH (StringVectCIter, it, list)
-    {
-        if (*it == path)
-            return true;
-    }
-    return false;
-}
-
-static void removeTemp(StringVect &restrict list)
-{
-    int cnt = 0;
-    std::sort(list.begin(), list.end());
-
-    FOR_EACH (StringVectIter, it, list)
-    {
-        if (*it != "serverlistplus.xml.part")
-        {
-            logger->log("file: %d %s",
-                cnt,
-                (*it).c_str());
-            cnt ++;
-        }
-    }
-
-    FOR_EACH (StringVectIter, it, list)
-    {
-        if (*it == "serverlistplus.xml.part")
-        {
-            list.erase(it);
-            return;
-        }
-    }
-}
-
-TEST_CASE("VirtFs2 isDirectory1", "")
-{
-    VirtFs::init(".");
-    std::string name("data/test/test.zip");
-    std::string prefix;
-    if (Files::existsLocal(name) == false)
-        prefix = "../" + prefix;
-
-    VirtFs::mountDir(prefix + "data",
-        Append_false);
-
-    REQUIRE(VirtFs::isDirectory("test/units.xml") == false);
-    REQUIRE(VirtFs::isDirectory("test/units.xml/") == false);
-    REQUIRE(VirtFs::isDirectory("test//units.xml") == false);
-    REQUIRE(VirtFs::isDirectory("test/units123.xml") == false);
-    REQUIRE(VirtFs::isDirectory("test//units123.xml") == false);
-    REQUIRE(VirtFs::isDirectory("tesQ/units.xml") == false);
-    REQUIRE(VirtFs::isDirectory("tesQ//units.xml") == false);
-    REQUIRE(VirtFs::isDirectory("units.xml") == false);
-    REQUIRE(VirtFs::isDirectory("test") == true);
-    REQUIRE(VirtFs::isDirectory("test/") == true);
-    REQUIRE(VirtFs::isDirectory("test//") == true);
-    REQUIRE(VirtFs::isDirectory("test/dir1") == true);
-    REQUIRE(VirtFs::isDirectory("test//dir1") == true);
-    REQUIRE(VirtFs::isDirectory("test//dir1/") == true);
-    REQUIRE(VirtFs::isDirectory("test//dir1//") == true);
-    REQUIRE(VirtFs::isDirectory("test\\dir1/") == true);
-    REQUIRE(VirtFs::isDirectory("test/dir1//") == true);
-    REQUIRE(VirtFs::isDirectory("testQ") == false);
-    REQUIRE(VirtFs::isDirectory("testQ/") == false);
-    REQUIRE(VirtFs::isDirectory("testQ//") == false);
-
-    VirtFs::mountDir(prefix + "data/test",
-        Append_false);
-
-    REQUIRE(VirtFs::isDirectory("test/units.xml") == false);
-    REQUIRE(VirtFs::isDirectory("test/units.xml/") == false);
-    REQUIRE(VirtFs::isDirectory("test//units.xml") == false);
-    REQUIRE(VirtFs::isDirectory("test/units123.xml") == false);
-    REQUIRE(VirtFs::isDirectory("tesQ/units.xml") == false);
-    REQUIRE(VirtFs::isDirectory("units.xml") == false);
-    REQUIRE(VirtFs::isDirectory("test") == true);
-    REQUIRE(VirtFs::isDirectory("testQ") == false);
-    REQUIRE(VirtFs::isDirectory("test/dir1") == true);
-    REQUIRE(VirtFs::isDirectory("test\\dir1") == true);
-
-    VirtFs::unmountDir(prefix + "data/test");
-
-    REQUIRE(VirtFs::isDirectory("test/units.xml") == false);
-    REQUIRE(VirtFs::isDirectory("test/units123.xml") == false);
-    REQUIRE(VirtFs::isDirectory("tesQ/units.xml") == false);
-    REQUIRE(VirtFs::isDirectory("units.xml") == false);
-    REQUIRE(VirtFs::isDirectory("units.xml/") == false);
-    REQUIRE(VirtFs::isDirectory("test") == true);
-    REQUIRE(VirtFs::isDirectory("test/") == true);
-    REQUIRE(VirtFs::isDirectory("testQ") == false);
-    REQUIRE(VirtFs::isDirectory("test/dir1") == true);
-
-    VirtFs::unmountDirSilent(prefix + "data");
-    VirtFs::deinit();
-}
-
-TEST_CASE("VirtFs2 isDirectory2", "")
-{
-    VirtFs::init(".");
-    std::string name("data/test/test.zip");
-    std::string prefix;
-    if (Files::existsLocal(name) == false)
-        prefix = "../" + prefix;
-
-    VirtFs::mountZip(prefix + "data/test/test2.zip",
-        Append_false);
-
-    REQUIRE(VirtFs::isDirectory("dir2/units.xml") == false);
-    REQUIRE(VirtFs::isDirectory("dir2/units.xml/") == false);
-    REQUIRE(VirtFs::isDirectory("dir2//units.xml") == false);
-    REQUIRE(VirtFs::isDirectory("dir2/units123.xml") == false);
-    REQUIRE(VirtFs::isDirectory("dir2//units123.xml") == false);
-    REQUIRE(VirtFs::isDirectory("tesQ/units.xml") == false);
-    REQUIRE(VirtFs::isDirectory("tesQ//units.xml") == false);
-    REQUIRE(VirtFs::isDirectory("units.xml") == false);
-    REQUIRE(VirtFs::isDirectory("dir") == true);
-    REQUIRE(VirtFs::isDirectory("dir2/") == true);
-    REQUIRE(VirtFs::isDirectory("dir2//") == true);
-    REQUIRE(VirtFs::isDirectory("dir/1") == true);
-    REQUIRE(VirtFs::isDirectory("dir//1") == true);
-    REQUIRE(VirtFs::isDirectory("dir\\1/") == true);
-    REQUIRE(VirtFs::isDirectory("dir/1") == true);
-    REQUIRE(VirtFs::isDirectory("dir/1/zzz") == false);
-    REQUIRE(VirtFs::isDirectory("test/dir1\\") == false);
-    REQUIRE(VirtFs::isDirectory("testQ") == false);
-    REQUIRE(VirtFs::isDirectory("testQ/") == false);
-    REQUIRE(VirtFs::isDirectory("testQ//") == false);
-
-    VirtFs::mountZip(prefix + "data/test/test.zip",
-        Append_false);
-
-    REQUIRE(VirtFs::isDirectory("dir2/units.xml") == false);
-    REQUIRE(VirtFs::isDirectory("dir2/units.xml/") == false);
-    REQUIRE(VirtFs::isDirectory("dir2\\units.xml") == false);
-    REQUIRE(VirtFs::isDirectory("dir2/units123.xml") == false);
-    REQUIRE(VirtFs::isDirectory("dir2//units123.xml") == false);
-    REQUIRE(VirtFs::isDirectory("tesQ/units.xml") == false);
-    REQUIRE(VirtFs::isDirectory("tesQ//units.xml") == false);
-    REQUIRE(VirtFs::isDirectory("units.xml") == false);
-    REQUIRE(VirtFs::isDirectory("dir") == true);
-    REQUIRE(VirtFs::isDirectory("dir2/") == true);
-    REQUIRE(VirtFs::isDirectory("dir2\\") == true);
-    REQUIRE(VirtFs::isDirectory("dir/1") == true);
-    REQUIRE(VirtFs::isDirectory("dir//1") == true);
-    REQUIRE(VirtFs::isDirectory("dir//1/") == true);
-    REQUIRE(VirtFs::isDirectory("dir/1") == true);
-    REQUIRE(VirtFs::isDirectory("dir/1/zzz") == false);
-    REQUIRE(VirtFs::isDirectory("test/dir1//") == false);
-    REQUIRE(VirtFs::isDirectory("testQ") == false);
-    REQUIRE(VirtFs::isDirectory("testQ/") == false);
-    REQUIRE(VirtFs::isDirectory("testQ//") == false);
-
-    VirtFs::unmountZip(prefix + "data/test/test2.zip");
-
-    REQUIRE(VirtFs::isDirectory("dir2/units.xml") == false);
-    REQUIRE(VirtFs::isDirectory("dir2/units.xml/") == false);
-    REQUIRE(VirtFs::isDirectory("dir2//units.xml") == false);
-    REQUIRE(VirtFs::isDirectory("dir2/units123.xml") == false);
-    REQUIRE(VirtFs::isDirectory("dir2//units123.xml") == false);
-    REQUIRE(VirtFs::isDirectory("tesQ/units.xml") == false);
-    REQUIRE(VirtFs::isDirectory("tesQ//units.xml") == false);
-    REQUIRE(VirtFs::isDirectory("units.xml") == false);
-    REQUIRE(VirtFs::isDirectory("dir") == true);
-    REQUIRE(VirtFs::isDirectory("dir2/") == false);
-    REQUIRE(VirtFs::isDirectory("dir2//") == false);
-    REQUIRE(VirtFs::isDirectory("dir/1") == false);
-    REQUIRE(VirtFs::isDirectory("dir\\1") == false);
-    REQUIRE(VirtFs::isDirectory("dir//1/") == false);
-    REQUIRE(VirtFs::isDirectory("dir/1") == false);
-    REQUIRE(VirtFs::isDirectory("dir/1/zzz") == false);
-    REQUIRE(VirtFs::isDirectory("test/dir1//") == false);
-    REQUIRE(VirtFs::isDirectory("testQ") == false);
-    REQUIRE(VirtFs::isDirectory("testQ/") == false);
-    REQUIRE(VirtFs::isDirectory("testQ//") == false);
-
-    VirtFs::unmountZip(prefix + "data/test/test.zip");
-    VirtFs::deinit();
-}
-
-TEST_CASE("VirtFs2 isDirectory3", "")
-{
-    VirtFs::init(".");
-    std::string name("data/test/test.zip");
-    std::string prefix;
-    if (Files::existsLocal(name) == false)
-        prefix = "../" + prefix;
-
-    VirtFs::mountDir2(prefix + "data",
-        "test",
-        Append_false);
-
-    REQUIRE(VirtFs::isDirectory("units.xml") == false);
-    REQUIRE(VirtFs::isDirectory("units.xml/") == false);
-    REQUIRE(VirtFs::isDirectory("units123.xml") == false);
-    REQUIRE(VirtFs::isDirectory("tesQ/units.xml") == false);
-    REQUIRE(VirtFs::isDirectory("tesQ//units.xml") == false);
-    REQUIRE(VirtFs::isDirectory("test") == false);
-    REQUIRE(VirtFs::isDirectory("dir1") == true);
-    REQUIRE(VirtFs::isDirectory("dir2//") == true);
-    REQUIRE(VirtFs::isDirectory("test/dir1") == false);
-    REQUIRE(VirtFs::isDirectory("testQ") == false);
-    REQUIRE(VirtFs::isDirectory("testQ/") == false);
-    REQUIRE(VirtFs::isDirectory("testQ//") == false);
-
-    VirtFs::unmountDirSilent2(prefix + "data",
-        "test");
-    VirtFs::deinit();
-}
-
-TEST_CASE("VirtFs2 isDirectory4", "")
-{
-    VirtFs::init(".");
-    std::string name("data/test/test.zip");
-    std::string prefix;
-    if (Files::existsLocal(name) == false)
-        prefix = "../" + prefix;
-
-    VirtFs::mountZip2(prefix + "data/test/test2.zip",
-        "dir",
-        Append_false);
-
-    REQUIRE(VirtFs::isDirectory("dir2/units.xml") == false);
-    REQUIRE(VirtFs::isDirectory("dir2/units.xml/") == false);
-    REQUIRE(VirtFs::isDirectory("dir2//units.xml") == false);
-    REQUIRE(VirtFs::isDirectory("dir2/units123.xml") == false);
-    REQUIRE(VirtFs::isDirectory("dir2//units123.xml") == false);
-    REQUIRE(VirtFs::isDirectory("tesQ/units.xml") == false);
-    REQUIRE(VirtFs::isDirectory("tesQ//units.xml") == false);
-    REQUIRE(VirtFs::isDirectory("units.xml") == false);
-    REQUIRE(VirtFs::isDirectory("1") == true);
-    REQUIRE(VirtFs::isDirectory("gpl") == true);
-    REQUIRE(VirtFs::isDirectory("dir2/") == false);
-    REQUIRE(VirtFs::isDirectory("dir/1") == false);
-    REQUIRE(VirtFs::isDirectory("dir/1/zzz") == false);
-    REQUIRE(VirtFs::isDirectory("test/dir1\\") == false);
-    REQUIRE(VirtFs::isDirectory("testQ") == false);
-    REQUIRE(VirtFs::isDirectory("testQ/") == false);
-    REQUIRE(VirtFs::isDirectory("testQ//") == false);
-
-    VirtFs::unmountZip2(prefix + "data/test/test2.zip",
-        "dir");
-    VirtFs::deinit();
-}
-
-TEST_CASE("VirtFs2 openRead1", "")
-{
-    VirtFs::init(".");
-    std::string name("data/test/test.zip");
-    std::string prefix;
-    if (Files::existsLocal(name) == false)
-        prefix = "../" + prefix;
-
-    VirtFs::mountDir(prefix + "data",
-        Append_false);
-
-    VirtFs::File *file = nullptr;
-
-    file = VirtFs::openRead("test/units.xml");
-    REQUIRE(file != nullptr);
-    VirtFs::close(file);
-    file = VirtFs::openRead("test\\units.xml");
-    REQUIRE(file != nullptr);
-    VirtFs::close(file);
-    file = VirtFs::openRead("test/units123.xml");
-    REQUIRE(file == nullptr);
-    file = VirtFs::openRead("tesQ/units.xml");
-    REQUIRE(file == nullptr);
-    file = VirtFs::openRead("units.xml");
-    REQUIRE(file == nullptr);
-    file = VirtFs::openRead("testQ");
-    REQUIRE(file == nullptr);
-
-    VirtFs::mountDir(prefix + "data/test",
-        Append_false);
-
-    file = VirtFs::openRead("test/units.xml");
-    REQUIRE(file != nullptr);
-    VirtFs::close(file);
-    file = VirtFs::openRead("test/units123.xml");
-    REQUIRE(file == nullptr);
-    file = VirtFs::openRead("tesQ/units.xml");
-    REQUIRE(file == nullptr);
-    file = VirtFs::openRead("units.xml");
-    REQUIRE(file != nullptr);
-    VirtFs::close(file);
-    file = VirtFs::openRead("testQ");
-    REQUIRE(file == nullptr);
-
-    VirtFs::unmountDir(prefix + "data/test");
-
-    file = VirtFs::openRead("test/units.xml");
-    REQUIRE(file != nullptr);
-    VirtFs::close(file);
-    file = VirtFs::openRead("test/units123.xml");
-    REQUIRE(file == nullptr);
-    file = VirtFs::openRead("tesQ/units.xml");
-    REQUIRE(file == nullptr);
-    file = VirtFs::openRead("units.xml");
-    REQUIRE(file == nullptr);
-    file = VirtFs::openRead("testQ");
-    REQUIRE(file == nullptr);
-
-    VirtFs::unmountDir(prefix + "data");
-    VirtFs::deinit();
-}
-
-TEST_CASE("VirtFs2 openRead2", "")
-{
-    VirtFs::init(".");
-    std::string name("data/test/test.zip");
-    std::string prefix("data/test/");
-    if (Files::existsLocal(name) == false)
-        prefix = "../" + prefix;
-
-    VirtFs::mountZip(prefix + "test2.zip",
-        Append_false);
-
-    VirtFs::File *file = nullptr;
-
-    file = VirtFs::openRead("dir2/units.xml");
-    REQUIRE(file != nullptr);
-    VirtFs::close(file);
-    file = VirtFs::openRead("dir2\\units.xml");
-    REQUIRE(file != nullptr);
-    VirtFs::close(file);
-    file = VirtFs::openRead("dir2/units123.xml");
-    REQUIRE(file == nullptr);
-    file = VirtFs::openRead("tesQ/units.xml");
-    REQUIRE(file == nullptr);
-    file = VirtFs::openRead("units.xml1");
-    REQUIRE(file == nullptr);
-    file = VirtFs::openRead("testQ");
-    REQUIRE(file == nullptr);
-    file = VirtFs::openRead("dir/brimmedhat.png");
-    REQUIRE(file == nullptr);
-    file = VirtFs::openRead("dir//brimmedhat.png");
-    REQUIRE(file == nullptr);
-
-    VirtFs::mountZip(prefix + "test.zip",
-        Append_false);
-
-    file = VirtFs::openRead("dir2/units.xml");
-    REQUIRE(file != nullptr);
-    VirtFs::close(file);
-    file = VirtFs::openRead("dir2//units.xml");
-    REQUIRE(file != nullptr);
-    VirtFs::close(file);
-    file = VirtFs::openRead("dir2/units123.xml");
-    REQUIRE(file == nullptr);
-    file = VirtFs::openRead("tesQ/units.xml");
-    REQUIRE(file == nullptr);
-    file = VirtFs::openRead("units.xml1");
-    REQUIRE(file == nullptr);
-    file = VirtFs::openRead("testQ");
-    REQUIRE(file == nullptr);
-    file = VirtFs::openRead("dir/brimmedhat.png");
-    REQUIRE(file != nullptr);
-    VirtFs::close(file);
-
-    VirtFs::unmountZip(prefix + "test.zip");
-
-    file = VirtFs::openRead("dir2/units.xml");
-    REQUIRE(file != nullptr);
-    VirtFs::close(file);
-    file = VirtFs::openRead("dir2\\/\\units.xml");
-    REQUIRE(file != nullptr);
-    VirtFs::close(file);
-    file = VirtFs::openRead("dir2/units123.xml");
-    REQUIRE(file == nullptr);
-    file = VirtFs::openRead("tesQ/units.xml");
-    REQUIRE(file == nullptr);
-    file = VirtFs::openRead("units.xml1");
-    REQUIRE(file == nullptr);
-    file = VirtFs::openRead("testQ");
-    REQUIRE(file == nullptr);
-    file = VirtFs::openRead("dir/brimmedhat.png");
-    REQUIRE(file == nullptr);
-
-    VirtFs::unmountZip(prefix + "test2.zip");
-
-    VirtFs::deinit();
-}
-
-TEST_CASE("VirtFs2 openRead3", "")
-{
-    VirtFs::init(".");
-    std::string name("data/test/test.zip");
-    std::string prefix;
-    if (Files::existsLocal(name) == false)
-        prefix = "../" + prefix;
-
-    VirtFs::mountDir2(prefix + "data",
-        "test",
-        Append_false);
-
-    VirtFs::File *file = nullptr;
-
-    file = VirtFs::openRead("units.xml");
-    REQUIRE(file != nullptr);
-    VirtFs::close(file);
-    file = VirtFs::openRead("test/units.xml");
-    REQUIRE(file == nullptr);
-    file = VirtFs::openRead("units123.xml");
-    REQUIRE(file == nullptr);
-    file = VirtFs::openRead("tesQ/units.xml");
-    REQUIRE(file == nullptr);
-    file = VirtFs::openRead("testQ");
-    REQUIRE(file == nullptr);
-    file = VirtFs::openRead("file1.txt");
-    REQUIRE(file == nullptr);
-    file = VirtFs::openRead("file2.txt");
-    REQUIRE(file == nullptr);
-
-    VirtFs::mountDir2(prefix + "data/test",
-        "dir2",
-        Append_false);
-
-    file = VirtFs::openRead("units.xml");
-    REQUIRE(file != nullptr);
-    VirtFs::close(file);
-    file = VirtFs::openRead("test/units.xml");
-    REQUIRE(file == nullptr);
-    file = VirtFs::openRead("units123.xml");
-    REQUIRE(file == nullptr);
-    file = VirtFs::openRead("tesQ/units.xml");
-    REQUIRE(file == nullptr);
-    file = VirtFs::openRead("testQ");
-    REQUIRE(file == nullptr);
-    file = VirtFs::openRead("file1.txt");
-    REQUIRE(file != nullptr);
-    VirtFs::close(file);
-    file = VirtFs::openRead("file2.txt");
-    REQUIRE(file != nullptr);
-    VirtFs::close(file);
-
-    VirtFs::unmountDir2(prefix + "data/test",
-        "dir2");
-
-    file = VirtFs::openRead("units.xml");
-    REQUIRE(file != nullptr);
-    VirtFs::close(file);
-    file = VirtFs::openRead("test/units.xml");
-    REQUIRE(file == nullptr);
-    file = VirtFs::openRead("units123.xml");
-    REQUIRE(file == nullptr);
-    file = VirtFs::openRead("tesQ/units.xml");
-    REQUIRE(file == nullptr);
-    file = VirtFs::openRead("testQ");
-    REQUIRE(file == nullptr);
-    file = VirtFs::openRead("file1.txt");
-    REQUIRE(file == nullptr);
-    file = VirtFs::openRead("file2.txt");
-    REQUIRE(file == nullptr);
-
-    VirtFs::unmountDir2(prefix + "data",
-        "test");
-    VirtFs::deinit();
-}
-
-TEST_CASE("VirtFs2 openRead4", "")
-{
-    VirtFs::init(".");
-    std::string name("data/test/test.zip");
-    std::string prefix("data/test/");
-    if (Files::existsLocal(name) == false)
-        prefix = "../" + prefix;
-
-    VirtFs::mountZip2(prefix + "test2.zip",
-        "dir",
-        Append_false);
-
-    VirtFs::File *file = nullptr;
-
-    file = VirtFs::openRead("dye.png");
-    REQUIRE(file != nullptr);
-    VirtFs::close(file);
-    file = VirtFs::openRead("1\\test.txt");
-    REQUIRE(file != nullptr);
-    VirtFs::close(file);
-    file = VirtFs::openRead("dir/dye.png");
-    REQUIRE(file == nullptr);
-    file = VirtFs::openRead("tesQ/units.xml");
-    REQUIRE(file == nullptr);
-    file = VirtFs::openRead("dye.png1");
-    REQUIRE(file == nullptr);
-    file = VirtFs::openRead("testQ");
-    REQUIRE(file == nullptr);
-    file = VirtFs::openRead("brimmedhat.png");
-    REQUIRE(file == nullptr);
-
-    VirtFs::mountZip2(prefix + "test.zip",
-        "dir",
-        Append_false);
-
-    file = VirtFs::openRead("dye.png");
-    REQUIRE(file != nullptr);
-    VirtFs::close(file);
-    file = VirtFs::openRead("1\\test.txt");
-    REQUIRE(file != nullptr);
-    VirtFs::close(file);
-    file = VirtFs::openRead("dir/dye.png");
-    REQUIRE(file == nullptr);
-    file = VirtFs::openRead("tesQ/units.xml");
-    REQUIRE(file == nullptr);
-    file = VirtFs::openRead("dye.png1");
-    REQUIRE(file == nullptr);
-    file = VirtFs::openRead("testQ");
-    REQUIRE(file == nullptr);
-    file = VirtFs::openRead("brimmedhat.png");
-    REQUIRE(file != nullptr);
-    VirtFs::close(file);
-
-    VirtFs::unmountZip2(prefix + "test.zip",
-        "dir");
-
-    file = VirtFs::openRead("dye.png");
-    REQUIRE(file != nullptr);
-    VirtFs::close(file);
-    file = VirtFs::openRead("1\\test.txt");
-    REQUIRE(file != nullptr);
-    VirtFs::close(file);
-    file = VirtFs::openRead("dir/dye.png");
-    REQUIRE(file == nullptr);
-    file = VirtFs::openRead("tesQ/units.xml");
-    REQUIRE(file == nullptr);
-    file = VirtFs::openRead("dye.png1");
-    REQUIRE(file == nullptr);
-    file = VirtFs::openRead("testQ");
-    REQUIRE(file == nullptr);
-    file = VirtFs::openRead("brimmedhat.png");
-    REQUIRE(file == nullptr);
-
-    VirtFs::unmountZip2(prefix + "test2.zip",
-        "dir");
-
-    VirtFs::deinit();
-}
-
-TEST_CASE("VirtFs2 permitLinks", "")
-{
-    VirtFs::init(".");
-    std::string name("data/test/test.zip");
-    std::string prefix;
-    if (Files::existsLocal(name) == false)
-        prefix = "../" + prefix;
-
-    VirtFs::mountDir(prefix + "data",
-        Append_false);
-
-    const int cnt1 = VirtFs::exists("test/test2.txt") ? 26 : 25;
-    const int cnt2 = 26;
-
-    StringVect list;
-    VirtFs::permitLinks(false);
-    VirtFs::getFiles("test", list);
-    removeTemp(list);
-    const size_t sz = list.size();
-    REQUIRE(sz == cnt1);
-
-    list.clear();
-    VirtFs::permitLinks(true);
-    VirtFs::getFiles("test", list);
-    removeTemp(list);
-    REQUIRE(list.size() == cnt2);
-
-    list.clear();
-    VirtFs::permitLinks(false);
-    VirtFs::getFiles("test", list);
-    removeTemp(list);
-    REQUIRE(list.size() == cnt1);
-
-    VirtFs::unmountDirSilent(prefix + "data");
-    VirtFs::deinit();
-}
-
-TEST_CASE("VirtFs2 read1", "")
-{
-    VirtFs::init(".");
-    std::string name("data/test/test.zip");
-    std::string prefix;
-    if (Files::existsLocal(name) == false)
-        prefix = "../" + prefix;
-
-    VirtFs::mountDir(prefix + "data",
-        Append_false);
-
-    VirtFs::File *file = VirtFs::openRead("test/test.txt");
-    REQUIRE(file != nullptr);
-    REQUIRE(VirtFs::fileLength(file) == 23);
-    const int fileSize = VirtFs::fileLength(file);
-
-    void *restrict buffer = calloc(fileSize + 1, 1);
-    REQUIRE(VirtFs::read(file, buffer, 1, fileSize) == fileSize);
-    REQUIRE(strcmp(static_cast<char*>(buffer),
-        "test line 1\ntest line 2") == 0);
-    REQUIRE(VirtFs::tell(file) == fileSize);
-    REQUIRE(VirtFs::eof(file) != 0);
-
-    free(buffer);
-    buffer = calloc(fileSize + 1, 1);
-    REQUIRE(VirtFs::seek(file, 12) != 0);
-    REQUIRE(VirtFs::eof(file) == 0);
-    REQUIRE(VirtFs::tell(file) == 12);
-    REQUIRE(VirtFs::read(file, buffer, 1, 11) == 11);
-    REQUIRE(strcmp(static_cast<char*>(buffer),
-        "test line 2") == 0);
-    REQUIRE(VirtFs::eof(file) != 0);
-
-    VirtFs::close(file);
-    free(buffer);
-
-    VirtFs::unmountDir(prefix + "data");
-    VirtFs::deinit();
-}
-
-TEST_CASE("VirtFs2 read2", "")
-{
-    VirtFs::init(".");
-    std::string name("data/test/test.zip");
-    std::string prefix("data/test/");
-    if (Files::existsLocal(name) == false)
-        prefix = "../" + prefix;
-
-    VirtFs::mountZip(prefix + "test2.zip",
-        Append_false);
-    VirtFs::File *file = nullptr;
-    void *restrict buffer = nullptr;
-
-    SECTION("test 1")
-    {
-        file = VirtFs::openRead("dir2//test.txt");
-        REQUIRE(file != nullptr);
-        REQUIRE(VirtFs::fileLength(file) == 23);
-        const int fileSize = VirtFs::fileLength(file);
-
-        buffer = calloc(fileSize + 1, 1);
-        REQUIRE(VirtFs::read(file, buffer, 1, fileSize) == fileSize);
-        REQUIRE(strcmp(static_cast<char*>(buffer),
-            "test line 1\ntest line 2") == 0);
-        REQUIRE(VirtFs::tell(file) == fileSize);
-        REQUIRE(VirtFs::eof(file) != 0);
-    }
-
-    SECTION("test 2")
-    {
-        file = VirtFs::openRead("dir2\\/test.txt");
-        REQUIRE(file != nullptr);
-        REQUIRE(VirtFs::fileLength(file) == 23);
-        const int fileSize = VirtFs::fileLength(file);
-
-        buffer = calloc(fileSize + 1, 1);
-        REQUIRE(VirtFs::seek(file, 12) != 0);
-        REQUIRE(VirtFs::eof(file) == 0);
-        REQUIRE(VirtFs::tell(file) == 12);
-        REQUIRE(VirtFs::read(file, buffer, 1, 11) == 11);
-        REQUIRE(strcmp(static_cast<char*>(buffer),
-            "test line 2") == 0);
-        REQUIRE(VirtFs::eof(file) != 0);
-    }
-
-    SECTION("test 3")
-    {
-        file = VirtFs::openRead("dir2//test.txt");
-        REQUIRE(file != nullptr);
-        const int fileSize = VirtFs::fileLength(file);
-
-        buffer = calloc(fileSize + 1, 1);
-        for (int f = 0; f < fileSize; f ++)
-        {
-            REQUIRE(VirtFs::seek(file, f) != 0);
-            REQUIRE(VirtFs::eof(file) == 0);
-            REQUIRE(VirtFs::tell(file) == f);
-        }
-    }
-
-    SECTION("test 4")
-    {
-        file = VirtFs::openRead("dir2/test.txt");
-        REQUIRE(file != nullptr);
-        const int fileSize = VirtFs::fileLength(file);
-        const char *restrict const str = "test line 1\ntest line 2";
-        buffer = calloc(fileSize + 1, 1);
-        for (int f = 0; f < fileSize - 1; f ++)
-        {
-            REQUIRE(VirtFs::read(file, buffer, 1, 1) == 1);
-            REQUIRE(static_cast<char*>(buffer)[0] == str[f]);
-            REQUIRE(VirtFs::eof(file) == 0);
-            REQUIRE(VirtFs::tell(file) == f + 1);
-        }
-        REQUIRE(VirtFs::read(file, buffer, 1, 1) == 1);
-        REQUIRE(static_cast<char*>(buffer)[0] == str[22]);
-        REQUIRE(VirtFs::eof(file) != 0);
-        REQUIRE(VirtFs::tell(file) == fileSize);
-    }
-
-    SECTION("test 5")
-    {
-        file = VirtFs::openRead("dir2\\\\test.txt");
-        REQUIRE(file != nullptr);
-        const int fileSize = VirtFs::fileLength(file);
-        const char *restrict const str = "test line 1\ntest line 2";
-        buffer = calloc(fileSize + 1, 1);
-        for (int f = 0; f < fileSize - 1; f += 2)
-        {
-            REQUIRE(VirtFs::read(file, buffer, 2, 1) == 1);
-            REQUIRE(static_cast<char*>(buffer)[0] == str[f]);
-            REQUIRE(static_cast<char*>(buffer)[1] == str[f + 1]);
-            REQUIRE(VirtFs::eof(file) == 0);
-            REQUIRE(VirtFs::tell(file) == f + 2);
-        }
-        REQUIRE(VirtFs::eof(file) == 0);
-        REQUIRE(VirtFs::tell(file) == 22);
-        REQUIRE(VirtFs::read(file, buffer, 2, 1) == 0);
-        REQUIRE(VirtFs::eof(file) == 0);
-    }
-
-    SECTION("test 6")
-    {
-        file = VirtFs::openRead("dir2//test.txt");
-        REQUIRE(file != nullptr);
-        const int fileSize = VirtFs::fileLength(file);
-        const char *restrict const str = "test line 1\ntest line 2";
-        buffer = calloc(fileSize + 1, 1);
-        for (int f = 0; f < fileSize - 1; f += 2)
-        {
-            REQUIRE(VirtFs::read(file, buffer, 1, 2) == 2);
-            REQUIRE(static_cast<char*>(buffer)[0] == str[f]);
-            REQUIRE(static_cast<char*>(buffer)[1] == str[f + 1]);
-            REQUIRE(VirtFs::eof(file) == 0);
-            REQUIRE(VirtFs::tell(file) == f + 2);
-        }
-        REQUIRE(VirtFs::eof(file) == 0);
-        REQUIRE(VirtFs::tell(file) == 22);
-        REQUIRE(VirtFs::read(file, buffer, 1, 2) == 1);
-        REQUIRE(static_cast<char*>(buffer)[0] == str[22]);
-        REQUIRE(VirtFs::eof(file) != 0);
-    }
-
-    VirtFs::close(file);
-    free(buffer);
-    VirtFs::unmountZip(prefix + "test2.zip");
-    VirtFs::deinit();
-}
-
-TEST_CASE("VirtFs2 loadFile1", "")
-{
-    VirtFs::init(".");
-    int fileSize = 0;
-    std::string name("data/test/test.zip");
-    std::string prefix;
-    if (Files::existsLocal(name) == false)
-        prefix = "../" + prefix;
-
-    VirtFs::mountDir(prefix + "data",
-        Append_false);
-
-    const char *const buffer = VirtFs::loadFile("test/test.txt", fileSize);
-    REQUIRE(static_cast<const void*>(buffer) != nullptr);
-    REQUIRE(fileSize == 23);
-    REQUIRE(strncmp(buffer, "test line 1\ntest line 2", 23) == 0);
-    delete [] buffer;
-
-    VirtFs::unmountDir(prefix + "data");
-    VirtFs::deinit();
-}
-
-TEST_CASE("VirtFs2 loadFile2", "")
-{
-    VirtFs::init(".");
-    int fileSize = 0;
-    std::string name("data/test/test.zip");
-    std::string prefix;
-    if (Files::existsLocal(name) == false)
-        prefix = "../" + prefix;
-
-    VirtFs::mountZip(prefix + "data/test/test2.zip",
-        Append_false);
-
-    SECTION("test 1")
-    {
-        const char *restrict buffer = VirtFs::loadFile("dir2//test.txt",
-            fileSize);
-        REQUIRE(static_cast<const void*>(buffer) != nullptr);
-        REQUIRE(fileSize == 23);
-        REQUIRE(strncmp(buffer, "test line 1\ntest line 2", 23) == 0);
-        delete [] buffer;
-    }
-
-    SECTION("test 2")
-    {
-        const char *restrict buffer = VirtFs::loadFile("dir2\\/test.txt",
-            fileSize);
-        REQUIRE(static_cast<const void*>(buffer) != nullptr);
-        REQUIRE(fileSize == 23);
-        REQUIRE(strncmp(buffer, "test line 1\ntest line 2", 23) == 0);
-        delete [] buffer;
-    }
-
-    VirtFs::unmountZip(prefix + "data/test/test2.zip");
-    VirtFs::deinit();
-}
-
-TEST_CASE("VirtFs2 loadFile3", "")
-{
-    VirtFs::init(".");
-    int fileSize = 0;
-    std::string name("data/test/test.zip");
-    std::string prefix;
-    if (Files::existsLocal(name) == false)
-        prefix = "../" + prefix;
-
-    VirtFs::mountDir2(prefix + "data",
-        "test",
-        Append_false);
-
-    const char *const buffer = VirtFs::loadFile("test.txt", fileSize);
-    REQUIRE(static_cast<const void*>(buffer) != nullptr);
-    REQUIRE(fileSize == 23);
-    REQUIRE(strncmp(buffer, "test line 1\ntest line 2", 23) == 0);
-    delete [] buffer;
-
-    VirtFs::unmountDir2(prefix + "data",
-        "test");
-    VirtFs::deinit();
-}
-
-TEST_CASE("VirtFs2 loadFile4", "")
-{
-    VirtFs::init(".");
-    int fileSize = 0;
-    std::string name("data/test/test.zip");
-    std::string prefix;
-    if (Files::existsLocal(name) == false)
-        prefix = "../" + prefix;
-
-    VirtFs::mountZip2(prefix + "data/test/test2.zip",
-        "dir2",
-        Append_false);
-
-    SECTION("test 1")
-    {
-        const char *restrict buffer = VirtFs::loadFile("test.txt",
-            fileSize);
-        REQUIRE(static_cast<const void*>(buffer) != nullptr);
-        REQUIRE(fileSize == 23);
-        REQUIRE(strncmp(buffer, "test line 1\ntest line 2", 23) == 0);
-        delete [] buffer;
-    }
-
-    SECTION("test 2")
-    {
-        const char *restrict buffer = VirtFs::loadFile("test.txt",
-            fileSize);
-        REQUIRE(static_cast<const void*>(buffer) != nullptr);
-        REQUIRE(fileSize == 23);
-        REQUIRE(strncmp(buffer, "test line 1\ntest line 2", 23) == 0);
-        delete [] buffer;
-    }
-
-    VirtFs::unmountZip2(prefix + "data/test/test2.zip",
-        "dir2");
-    VirtFs::deinit();
-}
-
-TEST_CASE("VirtFs2 rwops_read1", "")
-{
-    VirtFs::init(".");
-    std::string name("data/test/test.zip");
-    std::string prefix;
-    if (Files::existsLocal(name) == false)
-        prefix = "../" + prefix;
-
-    VirtFs::mountDir(prefix + "data",
-        Append_false);
-
-    SDL_RWops *file = VirtFs::rwopsOpenRead("test/test.txt");
-    REQUIRE(file != nullptr);
-#ifdef USE_SDL2
-    REQUIRE(file->size(file) == 23);
-#endif  // USE_SDL2
-
-    const int fileSize = 23;
-
-    void *restrict buffer = calloc(fileSize + 1, 1);
-    REQUIRE(file->read(file, buffer, 1, fileSize) == fileSize);
-    REQUIRE(strcmp(static_cast<char*>(buffer),
-        "test line 1\ntest line 2") == 0);
-    REQUIRE(file->seek(file, 0, SEEK_CUR) == fileSize);
-
-    free(buffer);
-    buffer = calloc(fileSize + 1, 1);
-    REQUIRE(file->seek(file, 12, SEEK_SET) != 0);
-    REQUIRE(file->seek(file, 0, SEEK_CUR) == 12);
-    REQUIRE(file->read(file, buffer, 1, 11) == 11);
-    REQUIRE(strcmp(static_cast<char*>(buffer),
-        "test line 2") == 0);
-
-    file->close(file);
-    free(buffer);
-
-    VirtFs::unmountDir(prefix + "data");
-    VirtFs::deinit();
-}
-
-TEST_CASE("VirtFs2 rwops_read2", "")
-{
-    VirtFs::init(".");
-    std::string name("data/test/test.zip");
-    std::string prefix("data/test/");
-    if (Files::existsLocal(name) == false)
-        prefix = "../" + prefix;
-
-    VirtFs::mountZip(prefix + "test2.zip",
-        Append_false);
-    SDL_RWops *file = nullptr;
-    void *restrict buffer = nullptr;
-
-    SECTION("test 1")
-    {
-        file = VirtFs::rwopsOpenRead("dir2//test.txt");
-        REQUIRE(file != nullptr);
-#ifdef USE_SDL2
-        REQUIRE(file->size(file) == 23);
-#endif  // USE_SDL2
-        const int fileSize = 23;
-
-        buffer = calloc(fileSize + 1, 1);
-        REQUIRE(file->read(file, buffer, 1, fileSize) == fileSize);
-        REQUIRE(strcmp(static_cast<char*>(buffer),
-            "test line 1\ntest line 2") == 0);
-        REQUIRE(file->seek(file, 0, SEEK_CUR) == fileSize);
-    }
-
-    SECTION("test 2")
-    {
-        file = VirtFs::rwopsOpenRead("dir2\\/test.txt");
-        REQUIRE(file != nullptr);
-#ifdef USE_SDL2
-        REQUIRE(file->size(file) == 23);
-#endif  // USE_SDL2
-        const int fileSize = 23;
-
-        buffer = calloc(fileSize + 1, 1);
-        REQUIRE(file->seek(file, 12, SEEK_SET) != 0);
-        REQUIRE(file->seek(file, 0, SEEK_CUR) == 12);
-        REQUIRE(file->read(file, buffer, 1, 11) == 11);
-        REQUIRE(strcmp(static_cast<char*>(buffer),
-            "test line 2") == 0);
-    }
-
-    SECTION("test 3")
-    {
-        file = VirtFs::rwopsOpenRead("dir2//test.txt");
-        REQUIRE(file != nullptr);
-        const int fileSize = 23;
-
-        buffer = calloc(fileSize + 1, 1);
-        for (int f = 0; f < fileSize; f ++)
-        {
-            REQUIRE(file->seek(file, f, SEEK_SET) == f);
-            REQUIRE(file->seek(file, 0, SEEK_CUR) == f);
-        }
-    }
-
-    SECTION("test 4")
-    {
-        file = VirtFs::rwopsOpenRead("dir2/test.txt");
-        REQUIRE(file != nullptr);
-        const int fileSize = 23;
-        const char *restrict const str = "test line 1\ntest line 2";
-        buffer = calloc(fileSize + 1, 1);
-        for (int f = 0; f < fileSize - 1; f ++)
-        {
-            REQUIRE(file->read(file, buffer, 1, 1) == 1);
-            REQUIRE(static_cast<char*>(buffer)[0] == str[f]);
-            REQUIRE(file->seek(file, 0, SEEK_CUR) == f + 1);
-        }
-        REQUIRE(file->read(file, buffer, 1, 1) == 1);
-        REQUIRE(static_cast<char*>(buffer)[0] == str[22]);
-        REQUIRE(file->seek(file, 0, SEEK_CUR) == fileSize);
-    }
-
-    SECTION("test 5")
-    {
-        file = VirtFs::rwopsOpenRead("dir2\\\\test.txt");
-        REQUIRE(file != nullptr);
-        const int fileSize = 23;
-        const char *restrict const str = "test line 1\ntest line 2";
-        buffer = calloc(fileSize + 1, 1);
-        for (int f = 0; f < fileSize - 1; f += 2)
-        {
-            REQUIRE(file->read(file, buffer, 2, 1) == 1);
-            REQUIRE(static_cast<char*>(buffer)[0] == str[f]);
-            REQUIRE(static_cast<char*>(buffer)[1] == str[f + 1]);
-            REQUIRE(file->seek(file, 0, SEEK_CUR) == f + 2);
-        }
-        REQUIRE(file->seek(file, 0, SEEK_CUR) == 22);
-        REQUIRE(file->read(file, buffer, 2, 1) == 0);
-    }
-
-    SECTION("test 6")
-    {
-        file = VirtFs::rwopsOpenRead("dir2//test.txt");
-        REQUIRE(file != nullptr);
-        const int fileSize = 23;
-        const char *restrict const str = "test line 1\ntest line 2";
-        buffer = calloc(fileSize + 1, 1);
-        for (int f = 0; f < fileSize - 1; f += 2)
-        {
-            REQUIRE(file->read(file, buffer, 1, 2) == 2);
-            REQUIRE(static_cast<char*>(buffer)[0] == str[f]);
-            REQUIRE(static_cast<char*>(buffer)[1] == str[f + 1]);
-            REQUIRE(file->seek(file, 0, SEEK_CUR) == f + 2);
-        }
-        REQUIRE(file->seek(file, 0, SEEK_CUR) == 22);
-        REQUIRE(file->read(file, buffer, 1, 2) == 1);
-        REQUIRE(static_cast<char*>(buffer)[0] == str[22]);
-    }
-
-    SECTION("test 7")
-    {
-        file = VirtFs::rwopsOpenRead("dir2//test.txt");
-        REQUIRE(file != nullptr);
-        const int fileSize = 23;
-        const char *restrict const str = "test line 1\ntest line 2";
-        buffer = calloc(fileSize + 1, 1);
-        for (int f = 0; f < fileSize - 1; f += 2)
-        {
-            REQUIRE(file->read(file, buffer, 1, 2) == 2);
-            REQUIRE(file->seek(file, -2, SEEK_CUR) == f);
-            REQUIRE(file->seek(file, 0, SEEK_CUR) == f);
-            REQUIRE(file->seek(file, 2, SEEK_CUR) == f + 2);
-            REQUIRE(static_cast<char*>(buffer)[0] == str[f]);
-            REQUIRE(static_cast<char*>(buffer)[1] == str[f + 1]);
-            REQUIRE(file->seek(file, 0, SEEK_CUR) == f + 2);
-        }
-        REQUIRE(file->seek(file, 0, SEEK_CUR) == 22);
-        REQUIRE(file->read(file, buffer, 1, 2) == 1);
-        REQUIRE(static_cast<char*>(buffer)[0] == str[22]);
-    }
-
-    SECTION("test 8")
-    {
-        file = VirtFs::rwopsOpenRead("dir2//test.txt");
-        REQUIRE(file != nullptr);
-        const int fileSize = 23;
-        const char *restrict const str = "test line 1\ntest line 2";
-        buffer = calloc(fileSize + 1, 1);
-        for (int f = 0; f < fileSize - 1; f += 2)
-        {
-            REQUIRE(file->seek(file, -f - 2, SEEK_END) == 23 - f - 2);
-            REQUIRE(file->read(file, buffer, 1, 2) == 2);
-            REQUIRE(static_cast<char*>(buffer)[0] == str[23 - f - 2]);
-            REQUIRE(static_cast<char*>(buffer)[1] == str[23 - f - 2 + 1]);
-            REQUIRE(file->seek(file, 0, SEEK_CUR) == 23 - f);
-        }
-        // 3
-        REQUIRE(file->seek(file, 1, SEEK_CUR) == 4);
-        // 4
-        REQUIRE(file->read(file, buffer, 1, 2) == 2);
-        // 6
-        REQUIRE(static_cast<char*>(buffer)[0] == str[4]);
-        REQUIRE(static_cast<char*>(buffer)[1] == str[5]);
-        REQUIRE(file->seek(file, -7, SEEK_CUR) == -1);
-        REQUIRE(file->seek(file, 6, SEEK_SET) == 6);
-        REQUIRE(file->seek(file, -6, SEEK_CUR) == 0);
-    }
-
-    if (file != nullptr)
-        file->close(file);
-    free(buffer);
-    VirtFs::unmountZip(prefix + "test2.zip");
-    VirtFs::deinit();
-}
-
-TEST_CASE("VirtFs2 rwops_read3", "")
-{
-    VirtFs::init(".");
-    std::string name("data/test/test.zip");
-    std::string prefix;
-    if (Files::existsLocal(name) == false)
-        prefix = "../" + prefix;
-
-    VirtFs::mountDir(prefix + "data",
-        Append_false);
-    SDL_RWops *file = nullptr;
-    void *restrict buffer = nullptr;
-
-    SECTION("test 1")
-    {
-        file = VirtFs::rwopsOpenRead("test/test.txt");
-        REQUIRE(file != nullptr);
-#ifdef USE_SDL2
-        REQUIRE(file->size(file) == 23);
-#endif  // USE_SDL2
-        const int fileSize = 23;
-
-        buffer = calloc(fileSize + 1, 1);
-        REQUIRE(file->read(file, buffer, 1, fileSize) == fileSize);
-        REQUIRE(strcmp(static_cast<char*>(buffer),
-            "test line 1\ntest line 2") == 0);
-        REQUIRE(file->seek(file, 0, SEEK_CUR) == fileSize);
-    }
-
-    SECTION("test 2")
-    {
-        file = VirtFs::rwopsOpenRead("test\\test.txt");
-        REQUIRE(file != nullptr);
-#ifdef USE_SDL2
-        REQUIRE(file->size(file) == 23);
-#endif  // USE_SDL2
-        const int fileSize = 23;
-
-        buffer = calloc(fileSize + 1, 1);
-        REQUIRE(file->seek(file, 12, SEEK_SET) != 0);
-        REQUIRE(file->seek(file, 0, SEEK_CUR) == 12);
-        REQUIRE(file->read(file, buffer, 1, 11) == 11);
-        REQUIRE(strcmp(static_cast<char*>(buffer),
-            "test line 2") == 0);
-    }
-
-    SECTION("test 3")
-    {
-        file = VirtFs::rwopsOpenRead("test\\/test.txt");
-        REQUIRE(file != nullptr);
-        const int fileSize = 23;
-
-        buffer = calloc(fileSize + 1, 1);
-        for (int f = 0; f < fileSize; f ++)
-        {
-            REQUIRE(file->seek(file, f, SEEK_SET) == f);
-            REQUIRE(file->seek(file, 0, SEEK_CUR) == f);
-        }
-    }
-
-    SECTION("test 4")
-    {
-        file = VirtFs::rwopsOpenRead("test/test.txt");
-        REQUIRE(file != nullptr);
-        const int fileSize = 23;
-        const char *restrict const str = "test line 1\ntest line 2";
-        buffer = calloc(fileSize + 1, 1);
-        for (int f = 0; f < fileSize - 1; f ++)
-        {
-            REQUIRE(file->read(file, buffer, 1, 1) == 1);
-            REQUIRE(static_cast<char*>(buffer)[0] == str[f]);
-            REQUIRE(file->seek(file, 0, SEEK_CUR) == f + 1);
-        }
-        REQUIRE(file->read(file, buffer, 1, 1) == 1);
-        REQUIRE(static_cast<char*>(buffer)[0] == str[22]);
-        REQUIRE(file->seek(file, 0, SEEK_CUR) == fileSize);
-    }
-
-    SECTION("test 5")
-    {
-        file = VirtFs::rwopsOpenRead("test///test.txt");
-        REQUIRE(file != nullptr);
-        const int fileSize = 23;
-        const char *restrict const str = "test line 1\ntest line 2";
-        buffer = calloc(fileSize + 1, 1);
-        for (int f = 0; f < fileSize - 1; f += 2)
-        {
-            REQUIRE(file->read(file, buffer, 2, 1) == 1);
-            REQUIRE(static_cast<char*>(buffer)[0] == str[f]);
-            REQUIRE(static_cast<char*>(buffer)[1] == str[f + 1]);
-            REQUIRE(file->seek(file, 0, SEEK_CUR) == f + 2);
-        }
-        REQUIRE(file->seek(file, 0, SEEK_CUR) == 22);
-        REQUIRE(file->read(file, buffer, 2, 1) == 0);
-    }
-
-    SECTION("test 6")
-    {
-        file = VirtFs::rwopsOpenRead("test\\\\test.txt");
-        REQUIRE(file != nullptr);
-        const int fileSize = 23;
-        const char *restrict const str = "test line 1\ntest line 2";
-        buffer = calloc(fileSize + 1, 1);
-        for (int f = 0; f < fileSize - 1; f += 2)
-        {
-            REQUIRE(file->read(file, buffer, 1, 2) == 2);
-            REQUIRE(static_cast<char*>(buffer)[0] == str[f]);
-            REQUIRE(static_cast<char*>(buffer)[1] == str[f + 1]);
-            REQUIRE(file->seek(file, 0, SEEK_CUR) == f + 2);
-        }
-        REQUIRE(file->seek(file, 0, SEEK_CUR) == 22);
-        REQUIRE(file->read(file, buffer, 1, 2) == 1);
-        REQUIRE(static_cast<char*>(buffer)[0] == str[22]);
-    }
-
-    SECTION("test 7")
-    {
-        file = VirtFs::rwopsOpenRead("test//test.txt");
-        REQUIRE(file != nullptr);
-        const int fileSize = 23;
-        const char *restrict const str = "test line 1\ntest line 2";
-        buffer = calloc(fileSize + 1, 1);
-        for (int f = 0; f < fileSize - 1; f += 2)
-        {
-            REQUIRE(file->read(file, buffer, 1, 2) == 2);
-            REQUIRE(file->seek(file, -2, SEEK_CUR) == f);
-            REQUIRE(file->seek(file, 0, SEEK_CUR) == f);
-            REQUIRE(file->seek(file, 2, SEEK_CUR) == f + 2);
-            REQUIRE(static_cast<char*>(buffer)[0] == str[f]);
-            REQUIRE(static_cast<char*>(buffer)[1] == str[f + 1]);
-            REQUIRE(file->seek(file, 0, SEEK_CUR) == f + 2);
-        }
-        REQUIRE(file->seek(file, 0, SEEK_CUR) == 22);
-        REQUIRE(file->read(file, buffer, 1, 2) == 1);
-        REQUIRE(static_cast<char*>(buffer)[0] == str[22]);
-    }
-
-    SECTION("test 8")
-    {
-        file = VirtFs::rwopsOpenRead("test/test.txt");
-        REQUIRE(file != nullptr);
-        const int fileSize = 23;
-        const char *restrict const str = "test line 1\ntest line 2";
-        buffer = calloc(fileSize + 1, 1);
-        for (int f = 0; f < fileSize - 1; f += 2)
-        {
-            REQUIRE(file->seek(file, -f - 2, SEEK_END) == 23 - f - 2);
-            REQUIRE(file->read(file, buffer, 1, 2) == 2);
-            REQUIRE(static_cast<char*>(buffer)[0] == str[23 - f - 2]);
-            REQUIRE(static_cast<char*>(buffer)[1] == str[23 - f - 2 + 1]);
-            REQUIRE(file->seek(file, 0, SEEK_CUR) == 23 - f);
-        }
-        // 3
-        REQUIRE(file->seek(file, 1, SEEK_CUR) == 4);
-        // 4
-        REQUIRE(file->read(file, buffer, 1, 2) == 2);
-        // 6
-        REQUIRE(static_cast<char*>(buffer)[0] == str[4]);
-        REQUIRE(static_cast<char*>(buffer)[1] == str[5]);
-        REQUIRE(file->seek(file, -7, SEEK_CUR) == -1);
-        REQUIRE(file->seek(file, 6, SEEK_SET) == 6);
-        REQUIRE(file->seek(file, -6, SEEK_CUR) == 0);
-    }
-
-    if (file != nullptr)
-        file->close(file);
-    free(buffer);
-    VirtFs::unmountDir(prefix + "data");
-    VirtFs::deinit();
-}
-
-TEST_CASE("VirtFs2 getFiles zip1", "")
-{
-    VirtFs::init(".");
-    std::string name("data/test/test.zip");
-    std::string prefix;
-    if (Files::existsLocal(name) == false)
-        prefix = "../" + prefix;
-
-    VirtFs::mountZip(prefix + "data/test/test2.zip",
-        Append_false);
-
-    StringVect list;
-    VirtFs::getFiles("dir", list);
-    REQUIRE(list.size() == 2);
-    REQUIRE(inList(list, "dye.png"));
-    REQUIRE(inList(list, "hide.png"));
-
-    list.clear();
-    VirtFs::getFiles("dir2", list);
-    REQUIRE(list.size() == 4);
-    REQUIRE(inList(list, "hide.png"));
-    REQUIRE(inList(list, "paths.xml"));
-    REQUIRE(inList(list, "test.txt"));
-    REQUIRE(inList(list, "units.xml"));
-
-    VirtFs::unmountZip(prefix + "data/test/test2.zip");
-    VirtFs::deinit();
-}
-
-TEST_CASE("VirtFs2 getFiles zip2", "")
-{
-    VirtFs::init(".");
-    std::string name("data/test/test.zip");
-    std::string prefix;
-    if (Files::existsLocal(name) == false)
-        prefix = "../" + prefix;
-
-    VirtFs::mountZip2(prefix + "data/test/test2.zip",
-        "dir",
-        Append_false);
-
-    StringVect list;
-    VirtFs::getFiles(dirSeparator, list);
-    REQUIRE(list.size() == 2);
-    REQUIRE(inList(list, "dye.png"));
-    REQUIRE(inList(list, "hide.png"));
-
-    list.clear();
-    VirtFs::getFiles("1", list);
-    REQUIRE(list.size() == 2);
-    REQUIRE(inList(list, "file1.txt"));
-    REQUIRE(inList(list, "test.txt"));
-
-    VirtFs::unmountZip2(prefix + "data/test/test2.zip",
-        "dir");
-    VirtFs::deinit();
-}
-
-TEST_CASE("VirtFs2 getDirs1", "")
-{
-    VirtFs::init(".");
-    std::string name("data/test/test.zip");
-    std::string prefix;
-    if (Files::existsLocal(name) == false)
-        prefix = "../" + prefix;
-
-    VirtFs::mountZip(prefix + "data/test/test2.zip",
-        Append_false);
-
-    StringVect list;
-    VirtFs::getDirs("dir", list);
-    REQUIRE(list.size() == 2);
-    REQUIRE(inList(list, "1"));
-    REQUIRE(inList(list, "gpl"));
-    list.clear();
-
-    VirtFs::getDirs("dir2", list);
-    REQUIRE(list.empty());
-
-    VirtFs::unmountZip(prefix + "data/test/test2.zip");
-    VirtFs::deinit();
-}
-
-TEST_CASE("VirtFs2 getDirs2", "")
-{
-    VirtFs::init(".");
-    std::string name("data/test/test.zip");
-    std::string prefix;
-    if (Files::existsLocal(name) == false)
-        prefix = "../" + prefix;
-    StringVect list;
-
-    SECTION("dir1")
-    {
-        VirtFs::mountDir(prefix + "data/test",
-            Append_false);
-
-        VirtFs::getDirs("/", list);
-//        REQUIRE(list.size() == 2);
-        REQUIRE(inList(list, "dir1"));
-        REQUIRE(inList(list, "dir2"));
-        list.clear();
-
-        VirtFs::getDirs("dir1", list);
-        REQUIRE(list.empty());
-
-        VirtFs::unmountDir(prefix + "data/test");
-    }
-
-    SECTION("dir2")
-    {
-        VirtFs::mountDir(prefix + "data",
-            Append_false);
-
-        VirtFs::getDirs("sfx", list);
-        REQUIRE(inList(list, "system"));
-        list.clear();
-
-        VirtFs::getDirs("evol", list);
-        REQUIRE(list.size() == 2);
-        REQUIRE(inList(list, "icons"));
-        REQUIRE(inList(list, "images"));
-
-        VirtFs::unmountDir(prefix + "data");
-    }
-
-    VirtFs::deinit();
-}
-
-TEST_CASE("VirtFs2 getDirs3", "")
-{
-    VirtFs::init(".");
-    std::string name("data/test/test.zip");
-    std::string prefix;
-    if (Files::existsLocal(name) == false)
-        prefix = "../" + prefix;
-
-    VirtFs::mountZip2(prefix + "data/test/test2.zip",
-        "dir",
-        Append_false);
-
-    StringVect list;
-    VirtFs::getDirs(dirSeparator, list);
-    REQUIRE(list.size() == 2);
-    REQUIRE(inList(list, "1"));
-    REQUIRE(inList(list, "gpl"));
-    list.clear();
-
-    VirtFs::getDirs("1", list);
-    REQUIRE(list.empty());
-
-    VirtFs::unmountZip2(prefix + "data/test/test2.zip",
-        "dir");
-    VirtFs::deinit();
-}
-
-TEST_CASE("VirtFs2 getDirs4", "")
-{
-    VirtFs::init(".");
-    std::string name("data/test/test.zip");
-    std::string prefix;
-    if (Files::existsLocal(name) == false)
-        prefix = "../" + prefix;
-    StringVect list;
-
-    SECTION("dir1")
-    {
-        VirtFs::mountDir2(prefix + "data",
-            "test",
-            Append_false);
-
-        VirtFs::getDirs("/", list);
-        REQUIRE(inList(list, "dir1"));
-        REQUIRE(inList(list, "dir2"));
-        list.clear();
-
-        VirtFs::getDirs("dir1", list);
-        REQUIRE(list.empty());
-
-        VirtFs::unmountDir2(prefix + "data",
-            "test");
-    }
-
-    VirtFs::deinit();
-}
-
-TEST_CASE("VirtFs2 getFilesWithDir1", "")
-{
-    VirtFs::init(".");
-    std::string name("data/test/test.zip");
-    std::string prefix;
-    if (Files::existsLocal(name) == false)
-        prefix = "../" + prefix;
-
-    VirtFs::mountZip(prefix + "data/test/test2.zip",
-        Append_false);
-
-    StringVect list;
-    VirtFs::getFilesWithDir("dir", list);
-    REQUIRE(list.size() == 2);
-    REQUIRE(inList(list, "dir", "dye.png"));
-    REQUIRE(inList(list, "dir", "hide.png"));
-    list.clear();
-
-    VirtFs::getFilesWithDir("dir2", list);
-    REQUIRE(list.size() == 4);
-    REQUIRE(inList(list, "dir2", "hide.png"));
-    REQUIRE(inList(list, "dir2", "paths.xml"));
-    REQUIRE(inList(list, "dir2", "test.txt"));
-    REQUIRE(inList(list, "dir2", "units.xml"));
-    list.clear();
-
-    VirtFs::getFilesWithDir(dirSeparator, list);
-    REQUIRE(list.size() > 2);
-    REQUIRE(inList(list, dirSeparator, "test.txt"));
-    REQUIRE(inList(list, dirSeparator, "units.xml"));
-    list.clear();
-
-    VirtFs::unmountZip(prefix + "data/test/test2.zip");
-    VirtFs::deinit();
-}
-
-TEST_CASE("VirtFs2 getFilesWithDir2", "")
-{
-    VirtFs::init(".");
-    std::string name("data/test/test.zip");
-    std::string prefix;
-    if (Files::existsLocal(name) == false)
-        prefix = "../" + prefix;
-    StringVect list;
-
-    SECTION("dir1")
-    {
-        VirtFs::mountDir(prefix + "data/graphics",
-            Append_false);
-
-        VirtFs::getFilesWithDir("/", list);
-        REQUIRE(list.size() <= 5);
-        VirtFs::unmountDir(prefix + "data/graphics");
-    }
-
-    SECTION("dir2")
-    {
-        VirtFs::mountDir(prefix + "data",
-            Append_false);
-
-        VirtFs::getFilesWithDir("music", list);
-        REQUIRE(list.size() <= 5);
-        REQUIRE(!list.empty());
-        REQUIRE(inList(list, "music", "keprohm.ogg"));
-        list.clear();
-
-        VirtFs::getFilesWithDir(pathJoin("evol", "icons"), list);
-#ifdef WIN32
-        REQUIRE(list.size() == 1);
-        REQUIRE(inList(list, pathJoin("evol", "icons"), "evol-client.ico"));
-#else  // WIN32
-
-        REQUIRE(list.size() == 3);
-        REQUIRE(inList(list, pathJoin("evol", "icons"), "evol-client.ico"));
-        REQUIRE(inList(list, pathJoin("evol", "icons"), "evol-client.png"));
-        REQUIRE(inList(list, pathJoin("evol", "icons"), "evol-client.xpm"));
-#endif  // WIN32
-
-        VirtFs::unmountDir(prefix + "data");
-    }
-
-    VirtFs::deinit();
-}
-
-TEST_CASE("VirtFs2 getFilesWithDir3", "")
-{
-    VirtFs::init(".");
-    std::string name("data/test/test.zip");
-    std::string prefix;
-    if (Files::existsLocal(name) == false)
-        prefix = "../" + prefix;
-
-    VirtFs::mountZip2(prefix + "data/test/test2.zip",
-        "dir",
-        Append_false);
-
-    StringVect list;
-    VirtFs::getFilesWithDir("1", list);
-    REQUIRE(list.size() == 2);
-    REQUIRE(inList(list, "1", "file1.txt"));
-    REQUIRE(inList(list, "1", "test.txt"));
-    list.clear();
-
-    VirtFs::getFilesWithDir(dirSeparator, list);
-    REQUIRE(list.size() == 2);
-    REQUIRE(inList(list, dirSeparator, "dye.png"));
-    REQUIRE(inList(list, dirSeparator, "hide.png"));
-    list.clear();
-
-    VirtFs::unmountZip2(prefix + "data/test/test2.zip",
-        "dir");
-    VirtFs::deinit();
-}
-
-TEST_CASE("VirtFs2 getFilesWithDir4", "")
-{
-    VirtFs::init(".");
-    std::string name("data/test/test.zip");
-    std::string prefix;
-    if (Files::existsLocal(name) == false)
-        prefix = "../" + prefix;
-    StringVect list;
-
-    SECTION("dir1")
-    {
-        VirtFs::mountDir2(prefix + "data/graphics",
-            "sprites",
-            Append_false);
-
-        VirtFs::getFilesWithDir("/", list);
-        REQUIRE(list.size() <= 16);
-        VirtFs::unmountDir2(prefix + "data/graphics",
-            "sprites");
-    }
-
-    SECTION("dir2")
-    {
-        VirtFs::mountDir2(prefix + "data",
-            "test",
-            Append_false);
-
-        VirtFs::getFilesWithDir("dir1", list);
-        REQUIRE(list.size() <= 6);
-        REQUIRE(!list.empty());
-        REQUIRE(inList(list, "dir1", "file1.txt"));
-        list.clear();
-
-        VirtFs::unmountDir2(prefix + "data",
-            "test");
-    }
-
-    VirtFs::deinit();
-}
diff --git a/src/unittests/fs/virtfs/zip.cc b/src/unittests/fs/virtfs/zip.cc
deleted file mode 100644
index 17491835e..000000000
--- a/src/unittests/fs/virtfs/zip.cc
+++ /dev/null
@@ -1,283 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2017  The ManaPlus Developers
- *
- *  This file is part of The ManaPlus Client.
- *
- *  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
- *  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, see <http://www.gnu.org/licenses/>.
- */
-
-#include "unittests/unittests.h"
-
-#include "logger.h"
-
-#include "fs/files.h"
-
-#include "fs/virtfs/fszip.h"
-#include "fs/virtfs/zipentry.h"
-#include "fs/virtfs/zipreader.h"
-#include "fs/virtfs/ziplocalheader.h"
-
-#include "debug.h"
-
-extern const char *dirSeparator;
-
-TEST_CASE("Zip readArchiveInfo", "")
-{
-    std::string name("data/test/test.zip");
-    std::string prefix;
-    const std::string sep = dirSeparator;
-    if (Files::existsLocal(name) == false)
-        prefix = "../";
-
-    SECTION("test.zip")
-    {
-        name = prefix + "data/test/test.zip";
-
-        VirtFs::ZipEntry *const entry = new VirtFs::ZipEntry(name,
-            dirSeparator,
-            VirtFs::FsZip::getFuncs());
-        STD_VECTOR<VirtFs::ZipLocalHeader*> &headers = entry->mHeaders;
-
-        REQUIRE(VirtFs::ZipReader::readArchiveInfo(entry));
-        REQUIRE(headers.size() == 2);
-        REQUIRE(entry->root == name);
-        REQUIRE(headers[0]->fileName == "dir" + sep + "hide.png");
-        REQUIRE(headers[0]->compressSize == 365);
-        REQUIRE(headers[0]->uncompressSize == 368);
-        REQUIRE(headers[1]->fileName == "dir" + sep + "brimmedhat.png");
-        REQUIRE(headers[1]->compressSize == 1959);
-        REQUIRE(headers[1]->uncompressSize == 1959);
-
-        delete entry;
-    }
-
-    SECTION("test2.zip")
-    {
-        name = prefix + "data/test/test2.zip";
-
-        VirtFs::ZipEntry *const entry = new VirtFs::ZipEntry(name,
-            dirSeparator,
-            VirtFs::FsZip::getFuncs());
-        STD_VECTOR<VirtFs::ZipLocalHeader*> &headers = entry->mHeaders;
-
-        REQUIRE(VirtFs::ZipReader::readArchiveInfo(entry));
-        REQUIRE(headers.size() == 11);
-        REQUIRE(entry->root == name);
-        REQUIRE(headers[0]->fileName == "test.txt");
-        REQUIRE(headers[0]->compressSize == 17);
-        REQUIRE(headers[0]->uncompressSize == 23);
-
-        REQUIRE(headers[1]->fileName == "dir2" + sep + "hide.png");
-        REQUIRE(headers[1]->compressSize == 365);
-        REQUIRE(headers[1]->uncompressSize == 368);
-
-        REQUIRE(headers[2]->fileName == "dir2" + sep + "test.txt");
-        REQUIRE(headers[2]->compressSize == 17);
-        REQUIRE(headers[2]->uncompressSize == 23);
-
-        REQUIRE(headers[3]->fileName == "dir2" + sep + "paths.xml");
-        REQUIRE(headers[3]->compressSize == 154);
-        REQUIRE(headers[3]->uncompressSize == 185);
-
-        REQUIRE(headers[4]->fileName == "dir2" + sep + "units.xml");
-        REQUIRE(headers[4]->compressSize == 202);
-        REQUIRE(headers[4]->uncompressSize == 306);
-
-        REQUIRE(headers[5]->fileName == "dir" + sep + "hide.png");
-        REQUIRE(headers[5]->compressSize == 365);
-        REQUIRE(headers[5]->uncompressSize == 368);
-
-        REQUIRE(headers[6]->fileName ==
-            "dir" + sep + "1" + sep + "test.txt");
-        REQUIRE(headers[6]->compressSize == 17);
-        REQUIRE(headers[6]->uncompressSize == 23);
-
-        REQUIRE(headers[7]->fileName ==
-            "dir" + sep + "1" + sep + "file1.txt");
-        REQUIRE(headers[7]->compressSize == 17);
-        REQUIRE(headers[7]->uncompressSize == 23);
-
-        REQUIRE(headers[8]->fileName ==
-            "dir" + sep + "gpl" + sep + "palette.gpl");
-        REQUIRE(headers[8]->compressSize == 128);
-        REQUIRE(headers[8]->uncompressSize == 213);
-
-        REQUIRE(headers[9]->fileName ==
-            "dir" + sep + "dye.png");
-        REQUIRE(headers[9]->compressSize == 794);
-        REQUIRE(headers[9]->uncompressSize == 794);
-
-        REQUIRE(headers[10]->fileName == "units.xml");
-        REQUIRE(headers[10]->compressSize == 202);
-        REQUIRE(headers[10]->uncompressSize == 306);
-
-        delete entry;
-    }
-
-    SECTION("test3.zip")
-    {
-        name = prefix + "data/test/test3.zip";
-
-        VirtFs::ZipEntry *const entry = new VirtFs::ZipEntry(name,
-            dirSeparator,
-            VirtFs::FsZip::getFuncs());
-        STD_VECTOR<VirtFs::ZipLocalHeader*> &headers = entry->mHeaders;
-
-        REQUIRE(VirtFs::ZipReader::readArchiveInfo(entry));
-        REQUIRE(headers.size() == 2);
-        REQUIRE(entry->root == name);
-        REQUIRE(headers[0]->fileName == "test.txt");
-        REQUIRE(headers[0]->compressSize == 17);
-        REQUIRE(headers[0]->uncompressSize == 23);
-        REQUIRE(headers[1]->fileName == "units.xml");
-        REQUIRE(headers[1]->compressSize == 202);
-        REQUIRE(headers[1]->uncompressSize == 306);
-
-        delete entry;
-    }
-
-    SECTION("test4.zip")
-    {
-        name = prefix + "data/test/test4.zip";
-
-        VirtFs::ZipEntry *const entry = new VirtFs::ZipEntry(name,
-            dirSeparator,
-            VirtFs::FsZip::getFuncs());
-        STD_VECTOR<VirtFs::ZipLocalHeader*> &headers = entry->mHeaders;
-
-        REQUIRE(VirtFs::ZipReader::readArchiveInfo(entry));
-        REQUIRE(entry->root == name);
-        REQUIRE(headers.empty());
-
-        delete entry;
-    }
-}
-
-TEST_CASE("Zip readCompressedFile", "")
-{
-    std::string name("data/test/test.zip");
-    std::string prefix;
-    if (Files::existsLocal(name) == false)
-        prefix = "../";
-
-    SECTION("test2.zip")
-    {
-        name = prefix + "data/test/test2.zip";
-
-        VirtFs::ZipEntry *const entry = new VirtFs::ZipEntry(name,
-            dirSeparator,
-            VirtFs::FsZip::getFuncs());
-        STD_VECTOR<VirtFs::ZipLocalHeader*> &headers = entry->mHeaders;
-
-        REQUIRE(VirtFs::ZipReader::readArchiveInfo(entry));
-        REQUIRE(headers.size() == 11);
-        REQUIRE(entry->root == name);
-        // test.txt
-        uint8_t *const buf = VirtFs::ZipReader::readCompressedFile(headers[0]);
-        REQUIRE(buf != nullptr);
-        delete [] buf;
-        delete entry;
-    }
-}
-
-TEST_CASE("Zip readFile", "")
-{
-    std::string name("data/test/test.zip");
-    std::string prefix;
-    if (Files::existsLocal(name) == false)
-        prefix = "../";
-
-    SECTION("test.zip")
-    {
-        name = prefix + "data/test/test.zip";
-
-        VirtFs::ZipEntry *const entry = new VirtFs::ZipEntry(name,
-            dirSeparator,
-            VirtFs::FsZip::getFuncs());
-        STD_VECTOR<VirtFs::ZipLocalHeader*> &headers = entry->mHeaders;
-
-        REQUIRE(VirtFs::ZipReader::readArchiveInfo(entry));
-        REQUIRE(headers.size() == 2);
-        REQUIRE(entry->root == name);
-        for (int f = 0; f < 2; f ++)
-        {
-            logger->log("test header: %s, %u, %u",
-                headers[f]->fileName.c_str(),
-                headers[f]->compressSize,
-                headers[f]->uncompressSize);
-            const uint8_t *const buf = VirtFs::ZipReader::readFile(headers[f]);
-            REQUIRE(buf != nullptr);
-            delete [] buf;
-        }
-        delete entry;
-    }
-
-    SECTION("test2.zip")
-    {
-        name = prefix + "data/test/test2.zip";
-
-        VirtFs::ZipEntry *const entry = new VirtFs::ZipEntry(name,
-            dirSeparator,
-            VirtFs::FsZip::getFuncs());
-        STD_VECTOR<VirtFs::ZipLocalHeader*> &headers = entry->mHeaders;
-
-        REQUIRE(VirtFs::ZipReader::readArchiveInfo(entry));
-        REQUIRE(headers.size() == 11);
-        REQUIRE(entry->root == name);
-        // test.txt
-        const uint8_t *buf = VirtFs::ZipReader::readFile(headers[0]);
-        REQUIRE(buf != nullptr);
-        const std::string str = std::string(reinterpret_cast<const char*>(buf),
-            headers[0]->uncompressSize);
-        REQUIRE(str == "test line 1\ntest line 2");
-        delete [] buf;
-        for (int f = 0; f < 11; f ++)
-        {
-            logger->log("test header: %s, %u, %u",
-                headers[f]->fileName.c_str(),
-                headers[f]->compressSize,
-                headers[f]->uncompressSize);
-            buf = VirtFs::ZipReader::readFile(headers[f]);
-            REQUIRE(buf != nullptr);
-            delete [] buf;
-        }
-        delete entry;
-    }
-
-    SECTION("test3.zip")
-    {
-        name = prefix + "data/test/test3.zip";
-
-        VirtFs::ZipEntry *const entry = new VirtFs::ZipEntry(name,
-            dirSeparator,
-            VirtFs::FsZip::getFuncs());
-        STD_VECTOR<VirtFs::ZipLocalHeader*> &headers = entry->mHeaders;
-
-        REQUIRE(VirtFs::ZipReader::readArchiveInfo(entry));
-        REQUIRE(headers.size() == 2);
-        REQUIRE(entry->root == name);
-        for (int f = 0; f < 2; f ++)
-        {
-            logger->log("test header: %s, %u, %u",
-                headers[f]->fileName.c_str(),
-                headers[f]->compressSize,
-                headers[f]->uncompressSize);
-            const uint8_t *const buf = VirtFs::ZipReader::readFile(headers[f]);
-            REQUIRE(buf != nullptr);
-            delete [] buf;
-        }
-        delete entry;
-    }
-}
diff --git a/src/unittests/gui/fonts/textchunklist.cc b/src/unittests/gui/fonts/textchunklist.cc
deleted file mode 100644
index c8df87455..000000000
--- a/src/unittests/gui/fonts/textchunklist.cc
+++ /dev/null
@@ -1,548 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2013-2017  The ManaPlus Developers
- *
- *  This file is part of The ManaPlus Client.
- *
- *  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
- *  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, see <http://www.gnu.org/licenses/>.
- */
-
-#include "unittests/unittests.h"
-
-#include "gui/fonts/font.h"
-#include "gui/fonts/textchunk.h"
-
-#include "debug.h"
-
-TEST_CASE("TextChunkList empty", "TextChunkList")
-{
-    TextChunkList list;
-
-    REQUIRE(0 == list.size);
-    REQUIRE(nullptr == list.start);
-    REQUIRE(nullptr == list.end);
-    REQUIRE(list.search.empty());
-    REQUIRE(list.searchWidth.empty());
-}
-
-TEST_CASE("TextChunkList add 1", "TextChunkList")
-{
-    TextChunkList list;
-
-    TextChunk *const chunk = new TextChunk("test",
-        Color(1, 2, 3), Color(2, 3, 4), nullptr);
-
-    list.insertFirst(chunk);
-
-    REQUIRE(1 == list.size);
-    REQUIRE(chunk == list.start);
-    REQUIRE(chunk == list.end);
-    REQUIRE(nullptr == chunk->prev);
-    REQUIRE(nullptr == chunk->next);
-
-    REQUIRE(1 == list.search.size());
-    REQUIRE(chunk == (*list.search.find(TextChunkSmall(
-        chunk->text, chunk->color, chunk->color2))).second);
-
-    REQUIRE(1 == list.searchWidth.size());
-    REQUIRE(chunk == (*list.searchWidth.find(chunk->text)).second);
-    delete chunk;
-}
-
-TEST_CASE("TextChunkList add 2", "TextChunkList")
-{
-    TextChunkList list;
-
-    TextChunk *const chunk1 = new TextChunk("test",
-        Color(1, 2, 3), Color(3, 4, 5), nullptr);
-    TextChunk *const chunk2 = new TextChunk("test",
-        Color(2, 3, 4), Color(4, 5, 6), nullptr);
-
-    list.insertFirst(chunk2);
-    list.insertFirst(chunk1);
-
-    REQUIRE(2 == list.size);
-    REQUIRE(chunk1 == list.start);
-    REQUIRE(chunk2 == list.end);
-    REQUIRE(nullptr == chunk1->prev);
-    REQUIRE(chunk2 == chunk1->next);
-    REQUIRE(chunk1 == chunk2->prev);
-    REQUIRE(nullptr == chunk2->next);
-
-    REQUIRE(2 == list.search.size());
-    REQUIRE(chunk1 == (*list.search.find(TextChunkSmall(
-        chunk1->text, chunk1->color, chunk1->color2))).second);
-    REQUIRE(chunk2 == (*list.search.find(TextChunkSmall(
-        chunk2->text, chunk2->color, chunk2->color2))).second);
-
-    REQUIRE(1 == list.searchWidth.size());
-    REQUIRE(chunk1 == (*list.searchWidth.find(chunk1->text)).second);
-    delete chunk1;
-    delete chunk2;
-}
-
-TEST_CASE("TextChunkList addRemoveBack 1", "TextChunkList")
-{
-    TextChunkList list;
-
-    TextChunk *const chunk = new TextChunk("test",
-        Color(1, 2, 3), Color(1, 2, 3), nullptr);
-
-    list.insertFirst(chunk);
-    list.removeBack();
-
-    REQUIRE(0 == list.size);
-    REQUIRE(nullptr == list.start);
-    REQUIRE(nullptr == list.end);
-    REQUIRE(list.search.empty());
-    REQUIRE(list.searchWidth.empty());
-}
-
-TEST_CASE("TextChunkList addRemoveBack 2", "TextChunkList")
-{
-    TextChunkList list;
-
-    TextChunk *const chunk1 = new TextChunk("test",
-        Color(1, 2, 3), Color(1, 2, 3), nullptr);
-    TextChunk *const chunk2 = new TextChunk("test2",
-        Color(1, 2, 4), Color(1, 2, 5), nullptr);
-
-    list.insertFirst(chunk2);
-    list.insertFirst(chunk1);
-    list.removeBack();
-
-    REQUIRE(1 == list.size);
-    REQUIRE(chunk1 == list.start);
-    REQUIRE(chunk1 == list.end);
-    REQUIRE(nullptr == chunk1->prev);
-    REQUIRE(nullptr == chunk1->next);
-
-    REQUIRE(1 == list.search.size());
-    REQUIRE(chunk1 == (*list.search.find(TextChunkSmall(
-        chunk1->text, chunk1->color, chunk1->color2))).second);
-
-    REQUIRE(1 == list.searchWidth.size());
-    REQUIRE(chunk1 == (*list.searchWidth.find(chunk1->text)).second);
-    delete chunk1;
-}
-
-TEST_CASE("TextChunkList addRemoveBack 3", "TextChunkList")
-{
-    TextChunkList list;
-
-    TextChunk *const chunk1 = new TextChunk("test",
-        Color(1, 2, 3), Color(1, 2, 3), nullptr);
-    TextChunk *const chunk2 = new TextChunk("test2",
-        Color(2, 3, 4), Color(2, 3, 4), nullptr);
-
-    list.insertFirst(chunk2);
-    list.insertFirst(chunk1);
-    list.removeBack(2);
-
-    REQUIRE(0 == list.size);
-    REQUIRE(nullptr == list.start);
-    REQUIRE(nullptr == list.end);
-
-    REQUIRE(list.search.empty());
-    REQUIRE(list.searchWidth.empty());
-}
-
-TEST_CASE("TextChunkList addRemoveBack 4", "TextChunkList")
-{
-    TextChunkList list;
-
-    TextChunk *const chunk1 = new TextChunk("test",
-        Color(1, 2, 3), Color(1, 2, 3), nullptr);
-    TextChunk *const chunk2 = new TextChunk("test2",
-        Color(2, 3, 4), Color(2, 3, 4), nullptr);
-    TextChunk *const chunk3 = new TextChunk("test",
-        Color(3, 4, 5), Color(3, 4, 5), nullptr);
-
-    list.insertFirst(chunk3);
-    list.insertFirst(chunk2);
-    list.insertFirst(chunk1);
-    list.removeBack();
-    list.removeBack();
-
-    REQUIRE(1 == list.size);
-    REQUIRE(chunk1 == list.start);
-    REQUIRE(chunk1 == list.end);
-    REQUIRE(nullptr == chunk1->prev);
-    REQUIRE(nullptr == chunk1->next);
-
-    REQUIRE(1 == list.search.size());
-    REQUIRE(chunk1 == (*list.search.find(TextChunkSmall(
-        chunk1->text, chunk1->color, chunk1->color2))).second);
-
-    REQUIRE(list.searchWidth.empty());
-    delete chunk1;
-}
-
-TEST_CASE("TextChunkList moveToFirst 1", "TextChunkList")
-{
-    TextChunkList list;
-
-    TextChunk *const chunk = new TextChunk("test",
-        Color(1, 2, 3), Color(2, 3, 4), nullptr);
-
-    list.insertFirst(chunk);
-    list.moveToFirst(chunk);
-
-    REQUIRE(1 == list.size);
-    REQUIRE(chunk == list.start);
-    REQUIRE(chunk == list.end);
-    REQUIRE(nullptr == chunk->prev);
-    REQUIRE(nullptr == chunk->next);
-    delete chunk;
-}
-
-TEST_CASE("TextChunkList moveToFirst 2", "TextChunkList")
-{
-    TextChunkList list;
-
-    TextChunk *const chunk1 = new TextChunk("test",
-        Color(1, 2, 3), Color(1, 2, 3), nullptr);
-    TextChunk *const chunk2 = new TextChunk("test",
-        Color(2, 3, 4), Color(1, 2, 3), nullptr);
-
-    list.insertFirst(chunk1);
-    list.insertFirst(chunk2);
-    list.moveToFirst(chunk1);
-
-    REQUIRE(2 == list.size);
-    REQUIRE(chunk1 == list.start);
-    REQUIRE(chunk2 == list.end);
-    REQUIRE(nullptr == chunk1->prev);
-    REQUIRE(chunk2 == chunk1->next);
-    REQUIRE(chunk1 == chunk2->prev);
-    REQUIRE(nullptr == chunk2->next);
-    delete chunk1;
-    delete chunk2;
-}
-
-TEST_CASE("TextChunkList moveToFirst 3", "TextChunkList")
-{
-    TextChunkList list;
-
-    TextChunk *const chunk1 = new TextChunk("test",
-        Color(1, 2, 3), Color(1, 2, 3), nullptr);
-    TextChunk *const chunk2 = new TextChunk("test",
-        Color(1, 2, 4), Color(1, 2, 3), nullptr);
-    TextChunk *const chunk3 = new TextChunk("test",
-        Color(1, 2, 5), Color(1, 2, 3), nullptr);
-
-    list.insertFirst(chunk3);
-    list.insertFirst(chunk1);
-    list.insertFirst(chunk2);
-    list.moveToFirst(chunk1);
-
-    REQUIRE(3 == list.size);
-    REQUIRE(chunk1 == list.start);
-    REQUIRE(chunk3 == list.end);
-    REQUIRE(nullptr == chunk1->prev);
-    REQUIRE(chunk2 == chunk1->next);
-    REQUIRE(chunk1 == chunk2->prev);
-    REQUIRE(chunk3 == chunk2->next);
-    REQUIRE(chunk2 == chunk3->prev);
-    REQUIRE(nullptr == chunk3->next);
-    delete chunk1;
-    delete chunk2;
-    delete chunk3;
-}
-
-TEST_CASE("TextChunkList moveToFirst 4", "TextChunkList")
-{
-    TextChunkList list;
-
-    TextChunk *const chunk1 = new TextChunk("test",
-        Color(), Color(), nullptr);
-    TextChunk *const chunk2 = new TextChunk("test2",
-        Color(), Color(), nullptr);
-    TextChunk *const chunk3 = new TextChunk("test3",
-        Color(), Color(), nullptr);
-
-    list.insertFirst(chunk1);
-    list.insertFirst(chunk3);
-    list.insertFirst(chunk2);
-    list.moveToFirst(chunk1);
-
-    REQUIRE(3 == list.size);
-    REQUIRE(chunk1 == list.start);
-    REQUIRE(chunk3 == list.end);
-    REQUIRE(nullptr == chunk1->prev);
-    REQUIRE(chunk2 == chunk1->next);
-    REQUIRE(chunk1 == chunk2->prev);
-    REQUIRE(chunk3 == chunk2->next);
-    REQUIRE(chunk2 == chunk3->prev);
-    REQUIRE(nullptr == chunk3->next);
-    delete chunk1;
-    delete chunk2;
-    delete chunk3;
-}
-
-TEST_CASE("TextChunkList clear 1", "TextChunkList")
-{
-    TextChunkList list;
-    const int chunksLeft = textChunkCnt;
-
-    TextChunk *const chunk = new TextChunk("test",
-        Color(), Color(), nullptr);
-
-    list.insertFirst(chunk);
-    list.clear();
-
-    REQUIRE(0 == list.size);
-    REQUIRE(nullptr == list.start);
-    REQUIRE(nullptr == list.end);
-    REQUIRE(chunksLeft == textChunkCnt);
-    REQUIRE(list.search.empty());
-    REQUIRE(list.searchWidth.empty());
-}
-
-TEST_CASE("TextChunkList clear 2", "TextChunkList")
-{
-    TextChunkList list;
-    const int chunksLeft = textChunkCnt;
-
-    TextChunk *const chunk1 = new TextChunk("test",
-        Color(1, 2, 3), Color(2, 0, 0), nullptr);
-    TextChunk *const chunk2 = new TextChunk("test",
-        Color(1, 2, 3), Color(2, 0, 1), nullptr);
-    TextChunk *const chunk3 = new TextChunk("test",
-        Color(1, 2, 3), Color(2, 0, 2), nullptr);
-
-    list.insertFirst(chunk1);
-    list.insertFirst(chunk2);
-    list.insertFirst(chunk3);
-    list.clear();
-
-    REQUIRE(0 == list.size);
-    REQUIRE(nullptr == list.start);
-    REQUIRE(nullptr == list.end);
-    REQUIRE(chunksLeft == textChunkCnt);
-    REQUIRE(list.search.empty());
-    REQUIRE(list.searchWidth.empty());
-}
-
-TEST_CASE("TextChunkList clear 3", "TextChunkList")
-{
-    TextChunkList list;
-    const int chunksLeft = textChunkCnt;
-
-    TextChunk *const chunk1 = new TextChunk("test",
-        Color(1, 2, 3), Color(2, 0, 0), nullptr);
-    TextChunk *const chunk2 = new TextChunk("test",
-        Color(1, 2, 3), Color(2, 0, 1), nullptr);
-    TextChunk *const chunk3 = new TextChunk("test",
-        Color(1, 2, 3), Color(2, 0, 2), nullptr);
-
-    list.insertFirst(chunk1);
-    list.insertFirst(chunk2);
-    list.insertFirst(chunk3);
-    list.moveToFirst(chunk1);
-    REQUIRE((chunksLeft + 3) == textChunkCnt);
-    REQUIRE(3 == list.search.size());
-    REQUIRE(1 == list.searchWidth.size());
-
-    list.removeBack();
-    REQUIRE((chunksLeft + 2) == textChunkCnt);
-    REQUIRE(2 == list.search.size());
-    REQUIRE(list.searchWidth.empty());
-
-    list.clear();
-    REQUIRE(chunksLeft == textChunkCnt);
-    REQUIRE(list.search.empty());
-    REQUIRE(list.searchWidth.empty());
-}
-
-TEST_CASE("TextChunkList clear 4", "TextChunkList")
-{
-    TextChunkList list;
-    const int chunksLeft = textChunkCnt;
-
-    TextChunk *const chunk1 = new TextChunk("test",
-        Color(1, 2, 3), Color(2, 0, 0), nullptr);
-    TextChunk *const chunk2 = new TextChunk("test",
-        Color(1, 2, 3), Color(2, 0, 1), nullptr);
-    TextChunk *const chunk3 = new TextChunk("test3",
-        Color(1, 2, 3), Color(2, 0, 2), nullptr);
-
-    list.insertFirst(chunk1);
-    list.insertFirst(chunk2);
-    list.insertFirst(chunk3);
-    list.moveToFirst(chunk2);
-    REQUIRE((chunksLeft + 3) == textChunkCnt);
-    REQUIRE(3 == list.search.size());
-    REQUIRE(2 == list.searchWidth.size());
-
-    list.removeBack(2);
-    REQUIRE((chunksLeft + 1) == textChunkCnt);
-    REQUIRE(1 == list.search.size());
-    REQUIRE(list.searchWidth.empty());
-
-    list.clear();
-    REQUIRE(chunksLeft == textChunkCnt);
-    REQUIRE(list.search.empty());
-    REQUIRE(list.searchWidth.empty());
-}
-
-TEST_CASE("TextChunkList remove 1", "TextChunkList")
-{
-    TextChunkList list;
-    const int chunksLeft = textChunkCnt;
-
-    TextChunk *const chunk = new TextChunk("test",
-        Color(), Color(), nullptr);
-
-    list.insertFirst(chunk);
-    list.remove(chunk);
-    delete chunk;
-
-    REQUIRE(0 == list.size);
-    REQUIRE(nullptr == list.start);
-    REQUIRE(nullptr == list.end);
-    REQUIRE(chunksLeft == textChunkCnt);
-    REQUIRE(list.search.empty());
-    REQUIRE(list.searchWidth.empty());
-}
-
-TEST_CASE("TextChunkList remove 2", "TextChunkList")
-{
-    TextChunkList list;
-    const int chunksLeft = textChunkCnt;
-
-    TextChunk *const chunk1 = new TextChunk("test1",
-        Color(1, 2, 3), Color(2, 0, 0), nullptr);
-    TextChunk *const chunk2 = new TextChunk("test2",
-        Color(1, 2, 3), Color(2, 0, 1), nullptr);
-    TextChunk *const chunk3 = new TextChunk("test3",
-        Color(1, 2, 3), Color(2, 0, 2), nullptr);
-
-    list.insertFirst(chunk1);
-    list.insertFirst(chunk2);
-    list.insertFirst(chunk3);
-    list.remove(chunk1);
-    delete chunk1;
-
-    REQUIRE(2 == list.size);
-    REQUIRE(chunk3 == list.start);
-    REQUIRE(chunk2 == list.end);
-    REQUIRE((chunksLeft + 2) == textChunkCnt);
-    REQUIRE(2 == list.search.size());
-    REQUIRE(2 == list.searchWidth.size());
-    delete chunk2;
-    delete chunk3;
-}
-
-TEST_CASE("TextChunkList remove 3", "TextChunkList")
-{
-    TextChunkList list;
-    const int chunksLeft = textChunkCnt;
-
-    TextChunk *const chunk1 = new TextChunk("test1",
-        Color(1, 2, 3), Color(2, 0, 0), nullptr);
-    TextChunk *const chunk2 = new TextChunk("test2",
-        Color(1, 2, 3), Color(2, 0, 1), nullptr);
-    TextChunk *const chunk3 = new TextChunk("test3",
-        Color(1, 2, 3), Color(2, 0, 2), nullptr);
-
-    list.insertFirst(chunk1);
-    list.insertFirst(chunk2);
-    list.insertFirst(chunk3);
-    list.remove(chunk2);
-    delete chunk2;
-
-    REQUIRE(2 == list.size);
-    REQUIRE(chunk3 == list.start);
-    REQUIRE(chunk1 == list.end);
-    REQUIRE((chunksLeft + 2) == textChunkCnt);
-    REQUIRE(2 == list.search.size());
-    REQUIRE(2 == list.searchWidth.size());
-    delete chunk1;
-    delete chunk3;
-}
-
-TEST_CASE("TextChunkList sort 1", "TextChunkList")
-{
-    TextChunkSmall item1("test line1",
-        Color(1, 2, 3), Color(1, 2, 3));
-    TextChunkSmall item2("test line1",
-        Color(1, 2, 3), Color(1, 2, 3));
-    TextChunkSmall item3("test line2",
-        Color(1, 2, 3), Color(1, 2, 3));
-    REQUIRE(false == (item1 < item2));
-    REQUIRE(false == (item2 < item1));
-    REQUIRE(item1 < item3);
-    REQUIRE(false == (item3 < item1));
-}
-
-TEST_CASE("TextChunkList sort 2", "TextChunkList")
-{
-    TextChunkSmall item1("test line1",
-        Color(1, 2, 3), Color(1, 2, 3));
-    TextChunkSmall item2("test line1",
-        Color(2, 3, 4), Color(1, 2, 3));
-    REQUIRE(item1 < item2);
-    REQUIRE(false == (item2 < item1));
-}
-
-TEST_CASE("TextChunkList sort 3", "TextChunkList")
-{
-    TextChunkSmall item1("test line1",
-        Color(1, 2, 3), Color(1, 2, 3));
-    TextChunkSmall item2("test line1",
-        Color(1, 3, 4), Color(1, 2, 3));
-    REQUIRE(item1 < item2);
-    REQUIRE(false == (item2 < item1));
-}
-
-TEST_CASE("TextChunkList sort 4", "TextChunkList")
-{
-    TextChunkSmall item1("test line1",
-        Color(1, 2, 3), Color(1, 2, 3));
-    TextChunkSmall item2("test line1",
-        Color(1, 2, 4), Color(1, 2, 3));
-    REQUIRE(item1 < item2);
-    REQUIRE(false == (item2 < item1));
-}
-
-TEST_CASE("TextChunkList sort 5", "TextChunkList")
-{
-    TextChunkSmall item1("test line1",
-        Color(1, 2, 3), Color(1, 2, 3));
-    TextChunkSmall item2("test line1",
-        Color(1, 2, 3), Color(2, 2, 3));
-    REQUIRE(item1 < item2);
-    REQUIRE(false == (item2 < item1));
-}
-
-TEST_CASE("TextChunkList sort 6", "TextChunkList")
-{
-    TextChunkSmall item1("test line1",
-        Color(1, 2, 3), Color(1, 2, 3));
-    TextChunkSmall item2("test line1",
-        Color(1, 2, 3), Color(1, 3, 3));
-    REQUIRE(item1 < item2);
-    REQUIRE(false == (item2 < item1));
-}
-
-TEST_CASE("TextChunkList sort 7", "TextChunkList")
-{
-    TextChunkSmall item1("test line1",
-        Color(1, 2, 3), Color(1, 2, 3));
-    TextChunkSmall item2("test line1",
-        Color(1, 2, 3), Color(1, 2, 4));
-    REQUIRE(item1 < item2);
-    REQUIRE(false == (item2 < item1));
-}
diff --git a/src/unittests/gui/widgets/browserbox.cc b/src/unittests/gui/widgets/browserbox.cc
deleted file mode 100644
index 46a5f3b23..000000000
--- a/src/unittests/gui/widgets/browserbox.cc
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2012-2017  The ManaPlus Developers
- *
- *  This file is part of The ManaPlus Client.
- *
- *  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
- *  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, see <http://www.gnu.org/licenses/>.
- */
-
-#include "unittests/unittests.h"
-
-#include "client.h"
-#include "configuration.h"
-#include "configmanager.h"
-#include "dirs.h"
-#include "graphicsmanager.h"
-
-#include "being/actorsprite.h"
-
-#include "fs/virtfs/fs.h"
-
-#include "gui/gui.h"
-
-#include "gui/fonts/font.h"
-
-#include "gui/widgets/browserbox.h"
-
-#include "utils/delete2.h"
-#include "utils/env.h"
-
-#include "render/sdlgraphics.h"
-
-#include "resources/sdlimagehelper.h"
-
-#include "debug.h"
-
-TEST_CASE("BrowserBox tests", "browserbox")
-{
-    setEnv("SDL_VIDEODRIVER", "dummy");
-
-    client = new Client;
-    VirtFs::mountDirSilent("data", Append_false);
-    VirtFs::mountDirSilent("../data", Append_false);
-
-    mainGraphics = new SDLGraphics;
-    imageHelper = new SDLImageHelper;
-
-    Dirs::initRootDir();
-    Dirs::initHomeDir();
-
-    ConfigManager::initConfiguration();
-    setConfigDefaults2(config);
-    setBrandingDefaults(branding);
-
-#ifdef USE_SDL2
-    SDLImageHelper::setRenderer(graphicsManager.createRenderer(
-        graphicsManager.createWindow(640, 480, 0,
-        SDL_WINDOW_SHOWN | SDL_SWSURFACE), SDL_RENDERER_SOFTWARE));
-#else  // USE_SDL2
-
-    graphicsManager.createWindow(640, 480, 0, SDL_ANYFORMAT | SDL_SWSURFACE);
-#endif  // USE_SDL2
-
-    theme = new Theme;
-    Theme::selectSkin();
-
-    ActorSprite::load();
-    gui = new Gui();
-    gui->postInit(mainGraphics);
-
-    Widget::setGlobalFont(new Font(
-        "/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Oblique.ttf",
-        18,
-        TTF_STYLE_NORMAL));
-    BrowserBox *const box = new BrowserBox(nullptr,
-        Opaque_true,
-        "");
-    box->setWidth(100);
-    std::string row = "test";
-    box->addRow(row);
-    REQUIRE(box->hasRows() == true);
-    box->clearRows();
-    row = "@@";
-    box->addRow(row);
-    row = "@@|";
-    box->addRow(row);
-    row = "|@@";
-    box->addRow(row);
-    row = "@@|@@";
-    box->addRow(row);
-    row = "|@@@@";
-    box->addRow(row);
-    row = "@@11|22@@";
-    box->addRow(row);
-    row = "##@@11|22@@";
-    box->addRow(row);
-    row = "@@##|22@@";
-    box->addRow(row);
-    row = "@@11|##22@@";
-    box->addRow(row);
-    row = "@@11|22##@@";
-    box->addRow(row);
-    row = "@@11|22@@##";
-    box->addRow(row);
-    row = "<##@@11|22@@";
-    box->addRow(row);
-    row = "@@<##|22@@";
-    box->addRow(row);
-    row = "@@11|<##22@@";
-    box->addRow(row);
-    row = "@@11|22<##@@";
-    box->addRow(row);
-    row = "@@11|22@@<##";
-    box->addRow(row);
-    row = "<##11|22@@";
-    box->addRow(row);
-    row = "<##|22@@";
-    box->addRow(row);
-    row = "11|<##22@@";
-    box->addRow(row);
-    row = "11|22<##@@";
-    box->addRow(row);
-    row = "11|22@@<##";
-    box->addRow(row);
-    row = "##>@@11|22@@";
-    box->addRow(row);
-    row = "@@##>|22@@";
-    box->addRow(row);
-    row = "@@11|##>22@@";
-    box->addRow(row);
-    row = "@@11|22##>@@";
-    box->addRow(row);
-    row = "@@11|22@@##>";
-    box->addRow(row);
-    row = "<##11|22##>";
-    box->addRow(row);
-    row = "<##|22##>";
-    box->addRow(row);
-    row = "11|<##22##>";
-    box->addRow(row);
-    row = "11|22<####>";
-    box->addRow(row);
-    row = "11|22##><##";
-    box->addRow(row);
-    row = "%%@@11|22@@";
-    box->addRow(row);
-    row = "%%2@@11|22@@";
-    box->addRow(row);
-    row = "<%%11|22@@";
-    box->addRow(row);
-    row = "@@%%>|22@@";
-    box->addRow(row);
-    row = "<%%|22%%>";
-    box->addRow(row);
-    row = "11|22<%%%%>";
-    box->addRow(row);
-    row = "%%";
-    box->addRow(row);
-    row = "%%1";
-    box->addRow(row);
-    row = "%%##";
-    box->addRow(row);
-    row = "%%###";
-    box->addRow(row);
-    row = "##%%";
-    box->addRow(row);
-    row = "##1%%";
-    box->addRow(row);
-    row = "##%%2";
-    box->addRow(row);
-    row = "##1%%2";
-    box->addRow(row);
-
-    delete Widget::getGloablFont();
-    Widget::setGlobalFont(nullptr);
-    delete box;
-    delete2(client);
-    VirtFs::unmountDirSilent("data");
-    VirtFs::unmountDirSilent("../data");
-}
diff --git a/src/unittests/gui/windowmanager.cc b/src/unittests/gui/windowmanager.cc
deleted file mode 100644
index b7f1eee43..000000000
--- a/src/unittests/gui/windowmanager.cc
+++ /dev/null
@@ -1,991 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2013-2017  The ManaPlus Developers
- *
- *  This file is part of The ManaPlus Client.
- *
- *  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
- *  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, see <http://www.gnu.org/licenses/>.
- */
-
-#include "unittests/unittests.h"
-
-#include "client.h"
-#include "configmanager.h"
-#include "configuration.h"
-#include "dirs.h"
-#include "graphicsmanager.h"
-#include "main.h"
-#include "settings.h"
-#include "textcommand.h"
-
-#include "being/localplayer.h"
-
-#include "const/resources/currency.h"
-
-#include "fs/virtfs/fs.h"
-
-#include "gui/gui.h"
-#include "gui/mailmessage.h"
-#include "gui/userpalette.h"
-#include "gui/windowmanager.h"
-
-#include "gui/popups/beingpopup.h"
-#include "gui/popups/itempopup.h"
-#include "gui/popups/popupmenu.h"
-#include "gui/popups/skillpopup.h"
-#include "gui/popups/spellpopup.h"
-#include "gui/popups/speechbubble.h"
-#include "gui/popups/statuspopup.h"
-#include "gui/popups/textboxpopup.h"
-#include "gui/popups/textpopup.h"
-
-#include "gui/widgets/desktop.h"
-#include "gui/widgets/emoteshortcutcontainer.h"
-#include "gui/widgets/createwidget.h"
-
-#include "gui/windows/bankwindow.h"
-#include "gui/windows/buydialog.h"
-#include "gui/windows/buyingstoreselldialog.h"
-#include "gui/windows/buyselldialog.h"
-#include "gui/windows/charselectdialog.h"
-#include "gui/windows/changeemaildialog.h"
-#include "gui/windows/changepassworddialog.h"
-#include "gui/windows/chatwindow.h"
-#include "gui/windows/connectiondialog.h"
-#include "gui/windows/confirmdialog.h"
-#include "gui/windows/cutinwindow.h"
-#include "gui/windows/debugwindow.h"
-#include "gui/windows/didyouknowwindow.h"
-#include "gui/windows/editdialog.h"
-#include "gui/windows/editserverdialog.h"
-#include "gui/windows/eggselectiondialog.h"
-#include "gui/windows/emotewindow.h"
-#include "gui/windows/equipmentwindow.h"
-#include "gui/windows/helpwindow.h"
-#include "gui/windows/insertcarddialog.h"
-#include "gui/windows/inventorywindow.h"
-#include "gui/windows/itemamountwindow.h"
-#include "gui/windows/killstats.h"
-#include "gui/windows/logindialog.h"
-#include "gui/windows/maileditwindow.h"
-#include "gui/windows/mailviewwindow.h"
-#include "gui/windows/mailwindow.h"
-#include "gui/windows/minimap.h"
-#include "gui/windows/ministatuswindow.h"
-#include "gui/windows/npcdialog.h"
-#include "gui/windows/npcselldialog.h"
-#include "gui/windows/okdialog.h"
-#include "gui/windows/outfitwindow.h"
-#include "gui/windows/questswindow.h"
-#include "gui/windows/quitdialog.h"
-#include "gui/windows/registerdialog.h"
-#include "gui/windows/serverdialog.h"
-#include "gui/windows/serverinfowindow.h"
-#include "gui/windows/setupwindow.h"
-#include "gui/windows/shopwindow.h"
-#include "gui/windows/shortcutwindow.h"
-#include "gui/windows/skilldialog.h"
-#include "gui/windows/socialwindow.h"
-#include "gui/windows/statuswindow.h"
-#include "gui/windows/textcommandeditor.h"
-#include "gui/windows/textdialog.h"
-#include "gui/windows/textselectdialog.h"
-#include "gui/windows/tradewindow.h"
-#include "gui/windows/updaterwindow.h"
-#include "gui/windows/whoisonline.h"
-#include "gui/windows/worldselectdialog.h"
-
-#include "input/touch/touchmanager.h"
-
-#include "net/logindata.h"
-
-#include "net/eathena/charserverhandler.h"
-#include "net/eathena/inventoryhandler.h"
-#include "net/eathena/serverfeatures.h"
-#include "net/eathena/playerhandler.h"
-
-#include "render/sdlgraphics.h"
-
-#include "resources/groupinfo.h"
-#include "resources/sdlimagehelper.h"
-
-#include "resources/db/groupdb.h"
-#include "resources/db/unitsdb.h"
-
-#include "resources/item/item.h"
-
-#include "resources/map/map.h"
-
-#include "resources/resourcemanager/resourcemanager.h"
-
-#include "utils/delete2.h"
-#include "utils/env.h"
-#include "utils/gettext.h"
-
-#include "utils/translation/translationmanager.h"
-
-#include "debug.h"
-
-extern QuitDialog *quitDialog;
-
-TEST_CASE("Windows tests", "windowmanager")
-{
-    setEnv("SDL_VIDEODRIVER", "dummy");
-
-    client = new Client;
-    XML::initXML();
-    SDL_Init(SDL_INIT_VIDEO);
-    ResourceManager::deleteInstance();
-    ResourceManager::cleanOrphans(true);
-    VirtFs::mountDirSilent("data", Append_false);
-    VirtFs::mountDirSilent("../data", Append_false);
-    VirtFs::mountDirSilent("data/test", Append_false);
-    VirtFs::mountDirSilent("../data/test", Append_false);
-    setPathsDefaults(paths);
-    branding.setValue("onlineServerFile", "test/serverlistplus.xml");
-    mainGraphics = new SDLGraphics;
-    imageHelper = new SDLImageHelper;
-
-    Dirs::initRootDir();
-    Dirs::initHomeDir();
-
-    const std::string cfgName = settings.configDir +
-        "/nonexistserver/config.xml";
-    ::remove(cfgName.c_str());
-
-    ConfigManager::initConfiguration();
-    setConfigDefaults2(config);
-    setBrandingDefaults(branding);
-    setFeaturesDefaults(features);
-    ConfigManager::initServerConfig("nonexistserver");
-
-#ifdef USE_SDL2
-    SDLImageHelper::setRenderer(graphicsManager.createRenderer(
-        graphicsManager.createWindow(640, 480, 0,
-        SDL_WINDOW_SHOWN | SDL_SWSURFACE), SDL_RENDERER_SOFTWARE));
-#else  // USE_SDL2
-
-    graphicsManager.createWindow(640, 480, 0, SDL_ANYFORMAT | SDL_SWSURFACE);
-#endif  // USE_SDL2
-
-    userPalette = new UserPalette;
-    config.setValue("fontSize", 16);
-
-    theme = new Theme;
-    Theme::selectSkin();
-
-    localPlayer = new LocalPlayer(static_cast<BeingId>(1),
-        BeingTypeId_zero);
-
-    ActorSprite::load();
-    gui = new Gui();
-    gui->postInit(mainGraphics);
-    touchManager.init();
-    UnitsDb::load();
-    charServerHandler = new EAthena::CharServerHandler;
-    serverFeatures = new EAthena::ServerFeatures;
-    inventoryHandler = new EAthena::InventoryHandler;
-    playerHandler = new EAthena::PlayerHandler;
-    paths.setValue("itemIcons", "");
-
-    TranslationManager::init();
-
-    mainGraphics->setVideoMode(640, 480,
-        1,
-        8,
-        false,
-        false,
-        false,
-        false,
-        false);
-
-    SECTION("bankWindow")
-    {
-        CREATEWIDGETV0(bankWindow, BankWindow);
-        gui->draw();
-        mainGraphics->updateScreen();
-        delete2(bankWindow);
-    }
-    SECTION("buyDialog1")
-    {
-        BuyDialog *dialog;
-        CREATEWIDGETV0(dialog, BuyDialog);
-        gui->draw();
-        mainGraphics->updateScreen();
-        delete2(dialog);
-    }
-    SECTION("buyDialog2")
-    {
-        BuyDialog *dialog;
-        CREATEWIDGETV(dialog, BuyDialog,
-            BeingId_zero,
-            DEFAULT_CURRENCY);
-        gui->draw();
-        mainGraphics->updateScreen();
-        delete2(dialog);
-    }
-#ifdef TMWA_SUPPORT
-    SECTION("buyDialog3")
-    {
-        BuyDialog *dialog;
-        CREATEWIDGETV(dialog, BuyDialog,
-            "user",
-            DEFAULT_CURRENCY);
-        gui->draw();
-        mainGraphics->updateScreen();
-        delete2(dialog);
-    }
-#endif  // TMWA_SUPPORT
-    SECTION("buyDialog4")
-    {
-        BuyDialog *dialog;
-        BeingTypeId id = static_cast<BeingTypeId>(1);
-        Map *map = new Map("test map",
-            10, 10,
-            32, 32);
-        Being *being = Being::createBeing(BeingId_zero,
-            ActorType::Avatar,
-            id,
-            map);
-        CREATEWIDGETV(dialog, BuyDialog,
-            being,
-            DEFAULT_CURRENCY);
-        gui->draw();
-        mainGraphics->updateScreen();
-        delete2(dialog);
-        delete2(being);
-        delete2(map);
-    }
-    SECTION("BuyingStoreSellDialog")
-    {
-        BuyingStoreSellDialog *dialog;
-        CREATEWIDGETV(dialog, BuyingStoreSellDialog,
-            BeingId_zero, 0);
-        gui->draw();
-        mainGraphics->updateScreen();
-        delete2(dialog);
-    }
-    SECTION("BuySellDialog1")
-    {
-        BuySellDialog *dialog;
-        CREATEWIDGETV(dialog, BuySellDialog, BeingId_zero);
-        gui->draw();
-        mainGraphics->updateScreen();
-        delete2(dialog);
-    }
-    SECTION("BuySellDialog2")
-    {
-        BuySellDialog *dialog;
-        CREATEWIDGETV(dialog, BuySellDialog, "user");
-        gui->draw();
-        mainGraphics->updateScreen();
-        delete2(dialog);
-    }
-    SECTION("ChangeEmailDialog")
-    {
-        LoginData data;
-        ChangeEmailDialog *dialog;
-        CREATEWIDGETV(dialog, ChangeEmailDialog, data);
-        gui->draw();
-        mainGraphics->updateScreen();
-        delete2(dialog);
-    }
-    SECTION("ChangePasswordDialog")
-    {
-        LoginData data;
-        ChangePasswordDialog *dialog;
-        CREATEWIDGETV(dialog, ChangePasswordDialog, data);
-        gui->draw();
-        mainGraphics->updateScreen();
-        delete2(dialog);
-    }
-    SECTION("CharSelectDialog")
-    {
-        LoginData data;
-        CharSelectDialog *dialog;
-        CREATEWIDGETV(dialog, CharSelectDialog, data);
-        gui->draw();
-        mainGraphics->updateScreen();
-        delete2(dialog);
-    }
-    SECTION("CharCreateDialog")
-    {
-//        LoginData data;
-//        CharSelectDialog *dialog2;
-//        CREATEWIDGETV(dialog2, CharSelectDialog, data);
-//        CharCreateDialog *dialog;
-//        CREATEWIDGETV(dialog, CharCreateDialog, dialog2, 0);
-//        gui->draw();
-//        mainGraphics->updateScreen();
-//        delete2(dialog);
-//        delete2(dialog2);
-    }
-    SECTION("ChatWindow")
-    {
-        CREATEWIDGETV(chatWindow, ChatWindow,
-            "Chat");
-        gui->draw();
-        mainGraphics->updateScreen();
-        delete2(chatWindow);
-    }
-    SECTION("ConfirmDialog")
-    {
-        ConfirmDialog *dialog;
-        CREATEWIDGETV(dialog, ConfirmDialog,
-            "", "", SOUND_REQUEST, false, Modal_false, nullptr);
-        gui->draw();
-        mainGraphics->updateScreen();
-        delete2(dialog);
-    }
-    SECTION("CutinWindow")
-    {
-        CREATEWIDGETV0(cutInWindow, CutInWindow);
-        gui->draw();
-        mainGraphics->updateScreen();
-        delete2(cutInWindow);
-    }
-    SECTION("DebugWindow")
-    {
-        CREATEWIDGETV(debugWindow, DebugWindow,
-            "Debug");
-        gui->draw();
-        mainGraphics->updateScreen();
-        delete2(debugWindow);
-    }
-    SECTION("didYouKnowWindow")
-    {
-        CREATEWIDGETV0(didYouKnowWindow, DidYouKnowWindow);
-        gui->draw();
-        mainGraphics->updateScreen();
-        delete2(didYouKnowWindow);
-    }
-    SECTION("EditDialog")
-    {
-        EditDialog *dialog;
-        CREATEWIDGETV(dialog, EditDialog,
-            "", "", "", 100, nullptr, Modal_false);
-        gui->draw();
-        mainGraphics->updateScreen();
-        delete2(dialog);
-    }
-    SECTION("EditServerDialog")
-    {
-        ServerInfo mCurrentServer;
-        settings.configDir = VirtFs::getRealDir("test/serverlistplus.xml");
-        ServerDialog *serverDialog = CREATEWIDGETR(ServerDialog,
-            &mCurrentServer,
-            settings.configDir);
-        EditServerDialog *editServerDialog = CREATEWIDGETR(EditServerDialog,
-            serverDialog, mCurrentServer, 0);
-        gui->draw();
-        mainGraphics->updateScreen();
-        delete2(editServerDialog);
-        delete2(serverDialog);
-    }
-    SECTION("EggSelectionDialog")
-    {
-        EggSelectionDialog *dialog = CREATEWIDGETR0(EggSelectionDialog);
-        gui->draw();
-        mainGraphics->updateScreen();
-        delete2(dialog);
-    }
-    SECTION("EmoteWindow")
-    {
-        EmoteWindow *dialog = CREATEWIDGETR0(EmoteWindow);
-        gui->draw();
-        mainGraphics->updateScreen();
-        delete2(dialog);
-    }
-    SECTION("EquipmentWindow")
-    {
-        Equipment *equipment = new Equipment;
-        Map *map = new Map("test", 100, 100, 32, 32);
-        Being *being = Being::createBeing(BeingId_zero,
-            ActorType::Player,
-            BeingTypeId_zero,
-            map);
-        EquipmentWindow *dialog = CREATEWIDGETR(EquipmentWindow,
-            equipment, being, false);
-        gui->draw();
-        mainGraphics->updateScreen();
-        delete2(dialog);
-        delete2(being);
-        delete2(map);
-        delete2(equipment);
-    }
-    SECTION("helpWindow")
-    {
-        CREATEWIDGETV0(helpWindow, HelpWindow);
-        gui->draw();
-        mainGraphics->updateScreen();
-        delete2(helpWindow);
-    }
-    SECTION("InsertCardDialog")
-    {
-        Item *item = new Item(5000,
-            ItemType::Card,
-            1,
-            0,
-            ItemColor_one,
-            Identified_true,
-            Damaged_false,
-            Favorite_false,
-            Equipm_true,
-            Equipped_false);
-        InsertCardDialog *dialog = CREATEWIDGETR(InsertCardDialog,
-            0, item);
-        gui->draw();
-        mainGraphics->updateScreen();
-        delete2(dialog);
-        delete2(item);
-    }
-    SECTION("InventoryWindow")
-    {
-        Inventory *inventory = new Inventory(InventoryType::Inventory);
-        InventoryWindow *dialog = CREATEWIDGETR(InventoryWindow,
-            inventory);
-        gui->draw();
-        mainGraphics->updateScreen();
-        delete2(dialog);
-        delete2(inventory);
-    }
-    SECTION("ItemAmountWindow")
-    {
-        Item *item = new Item(5000,
-            ItemType::Card,
-            1,
-            0,
-            ItemColor_one,
-            Identified_true,
-            Damaged_false,
-            Favorite_false,
-            Equipm_true,
-            Equipped_false);
-        ItemAmountWindow *dialog = CREATEWIDGETR(ItemAmountWindow,
-            ItemAmountWindowUsage::ItemDrop, nullptr, item);
-        gui->draw();
-        mainGraphics->updateScreen();
-        delete2(dialog);
-        delete2(item);
-    }
-    SECTION("KillStats")
-    {
-        CREATEWIDGETV0(killStats, KillStats);
-        gui->draw();
-        mainGraphics->updateScreen();
-        delete2(killStats);
-    }
-    SECTION("loginDialog")
-    {
-        ServerInfo mCurrentServer;
-        LoginDialog *loginDialog = CREATEWIDGETR(LoginDialog,
-            loginData,
-            &mCurrentServer,
-            &settings.options.updateHost);
-        gui->draw();
-        mainGraphics->updateScreen();
-        delete2(loginDialog);
-    }
-    SECTION("MailEditWindow")
-    {
-        CREATEWIDGETV0(mailEditWindow, MailEditWindow);
-        gui->draw();
-        mainGraphics->updateScreen();
-        delete2(mailEditWindow);
-    }
-    SECTION("MailViewWindow")
-    {
-        MailMessage *message = new MailMessage;
-        CREATEWIDGETV(mailViewWindow, MailViewWindow,
-            message,
-            1);
-        gui->draw();
-        mainGraphics->updateScreen();
-        delete2(mailViewWindow);
-        delete message;
-    }
-    SECTION("MailWindow")
-    {
-        CREATEWIDGETV0(mailWindow, MailWindow);
-        gui->draw();
-        mainGraphics->updateScreen();
-        delete2(mailWindow);
-    }
-    SECTION("Minimap")
-    {
-        CREATEWIDGETV0(minimap, Minimap);
-        gui->draw();
-        mainGraphics->updateScreen();
-        delete2(minimap);
-    }
-    SECTION("MiniStatusWindow")
-    {
-        CREATEWIDGETV0(miniStatusWindow, MiniStatusWindow);
-        gui->draw();
-        mainGraphics->updateScreen();
-        delete2(miniStatusWindow);
-    }
-    SECTION("NpcDialog")
-    {
-        NpcDialog *dialog = CREATEWIDGETR(NpcDialog, BeingId_zero);
-        gui->draw();
-        mainGraphics->updateScreen();
-        delete2(dialog);
-    }
-    SECTION("NpcSellDialog")
-    {
-        NpcSellDialog *dialog = CREATEWIDGETR(NpcSellDialog, BeingId_zero);
-        gui->draw();
-        mainGraphics->updateScreen();
-        delete2(dialog);
-    }
-    SECTION("OkDialog")
-    {
-        OkDialog *dialog = CREATEWIDGETR(OkDialog,
-            "", "", "", DialogType::SILENCE, Modal_false,
-            ShowCenter_true, nullptr, 100);
-        gui->draw();
-        mainGraphics->updateScreen();
-        delete2(dialog);
-    }
-    SECTION("OutfitWindow")
-    {
-        CREATEWIDGETV0(outfitWindow, OutfitWindow);
-        gui->draw();
-        mainGraphics->updateScreen();
-        delete2(outfitWindow);
-    }
-    SECTION("QuestsWindow")
-    {
-        CREATEWIDGETV0(questsWindow, QuestsWindow);
-        gui->draw();
-        mainGraphics->updateScreen();
-        delete2(questsWindow);
-    }
-    SECTION("QuitDialog")
-    {
-        CREATEWIDGETV(quitDialog, QuitDialog,
-            &quitDialog);
-        gui->draw();
-        mainGraphics->updateScreen();
-        delete2(quitDialog);
-    }
-    SECTION("RegisterDialog")
-    {
-        RegisterDialog *dialog = CREATEWIDGETR(RegisterDialog,
-            loginData);
-        gui->draw();
-        mainGraphics->updateScreen();
-        delete2(dialog);
-    }
-    SECTION("serversDialog")
-    {
-        ServerInfo mCurrentServer;
-        settings.configDir = VirtFs::getRealDir("test/serverlistplus.xml");
-        ServerDialog *serverDialog = CREATEWIDGETR(ServerDialog,
-            &mCurrentServer,
-            settings.configDir);
-        gui->draw();
-        mainGraphics->updateScreen();
-        delete2(serverDialog);
-    }
-    SECTION("serversInfoWindow")
-    {
-        ServerInfo mCurrentServer;
-        CREATEWIDGETV(serverInfoWindow, ServerInfoWindow,
-            mCurrentServer);
-        gui->draw();
-        mainGraphics->updateScreen();
-        delete2(serverInfoWindow);
-    }
-    SECTION("setupWindow")
-    {
-        CREATEWIDGETV0(setupWindow, SetupWindow);
-        gui->draw();
-        mainGraphics->updateScreen();
-        delete2(setupWindow);
-    }
-    SECTION("ShopSellDialog")
-    {
-        // only tmwa skipping
-    }
-    SECTION("ShopWindow")
-    {
-        CREATEWIDGETV0(shopWindow, ShopWindow);
-        gui->draw();
-        mainGraphics->updateScreen();
-        delete2(shopWindow);
-    }
-    SECTION("ShortcutWindow1")
-    {
-        EmoteShortcutContainer *container =
-            new EmoteShortcutContainer(nullptr);
-        CREATEWIDGETV(itemShortcutWindow, ShortcutWindow,
-            "name",
-            container);
-        gui->draw();
-        mainGraphics->updateScreen();
-        delete2(itemShortcutWindow);
-    }
-    SECTION("ShortcutWindow2")
-    {
-        CREATEWIDGETV(itemShortcutWindow, ShortcutWindow, "");
-        gui->draw();
-        mainGraphics->updateScreen();
-        delete2(itemShortcutWindow);
-    }
-    SECTION("SkillDialog")
-    {
-        CREATEWIDGETV0(skillDialog, SkillDialog);
-        gui->draw();
-        mainGraphics->updateScreen();
-        delete2(skillDialog);
-    }
-    SECTION("SocialWindow")
-    {
-        CREATEWIDGETV0(socialWindow, SocialWindow);
-        gui->draw();
-        mainGraphics->updateScreen();
-        delete2(socialWindow);
-    }
-    SECTION("StatusWindow")
-    {
-        GroupDb::GroupInfos &groups = GroupDb::getGroups();
-        groups[0] = new GroupInfo;
-        groups[0]->name = std::string();
-        groups[0]->longName = std::string();
-        CREATEWIDGETV0(statusWindow, StatusWindow);
-        gui->draw();
-        mainGraphics->updateScreen();
-        delete2(statusWindow);
-        delete groups[0];
-        groups.clear();
-    }
-    SECTION("TextCommandEditor")
-    {
-        TextCommand *textCommand = new TextCommand(1, "", "", "",
-            CommandTarget::NoTarget, "");
-        TextCommandEditor *dialog = CREATEWIDGETR(TextCommandEditor,
-            textCommand);
-        gui->draw();
-        mainGraphics->updateScreen();
-        delete2(dialog);
-        delete2(textCommand);
-    }
-
-    SECTION("TextDialog")
-    {
-        TextDialog *dialog = CREATEWIDGETR(TextDialog,
-            "", "", nullptr, false);
-        gui->draw();
-        mainGraphics->updateScreen();
-        delete2(dialog);
-    }
-    SECTION("TextSelectDialog")
-    {
-        TextSelectDialog *dialog = CREATEWIDGETR(TextSelectDialog,
-            "", "", AllowQuit_false);
-        gui->draw();
-        mainGraphics->updateScreen();
-        delete2(dialog);
-    }
-    SECTION("TradeWindow")
-    {
-        CREATEWIDGETV0(tradeWindow, TradeWindow);
-        gui->draw();
-        mainGraphics->updateScreen();
-        delete2(tradeWindow);
-    }
-    SECTION("UpdaterWindow")
-    {
-        CREATEWIDGETV(updaterWindow, UpdaterWindow,
-            "", "", false, UpdateType::Skip);
-        gui->draw();
-        mainGraphics->updateScreen();
-        delete2(updaterWindow);
-    }
-    SECTION("WhoIsOnline")
-    {
-        CREATEWIDGETV0(whoIsOnline, WhoIsOnline);
-        gui->draw();
-        mainGraphics->updateScreen();
-        delete2(whoIsOnline);
-    }
-    SECTION("WorldSelectDialog")
-    {
-        Worlds worlds;
-        WorldSelectDialog *dialog = CREATEWIDGETR(WorldSelectDialog,
-            worlds);
-        gui->draw();
-        mainGraphics->updateScreen();
-        delete2(dialog);
-    }
-    SECTION("popupMenu")
-    {
-        CREATEWIDGETV0(popupMenu, PopupMenu);
-        gui->draw();
-        mainGraphics->updateScreen();
-        delete2(popupMenu);
-    }
-    SECTION("skillPopup")
-    {
-        CREATEWIDGETV0(skillPopup, SkillPopup);
-        gui->draw();
-        mainGraphics->updateScreen();
-        delete2(skillPopup);
-    }
-    SECTION("SpeechBubble")
-    {
-        SpeechBubble *bubble = CREATEWIDGETR0(SpeechBubble);
-        gui->draw();
-        mainGraphics->updateScreen();
-        delete2(bubble);
-    }
-    SECTION("beingPopup")
-    {
-        CREATEWIDGETV0(beingPopup, BeingPopup);
-        gui->draw();
-        mainGraphics->updateScreen();
-        delete2(beingPopup);
-    }
-    SECTION("textPopup")
-    {
-        CREATEWIDGETV0(textPopup, TextPopup);
-        gui->draw();
-        mainGraphics->updateScreen();
-        delete2(textPopup);
-    }
-    SECTION("textBoxPopup")
-    {
-        CREATEWIDGETV0(textBoxPopup, TextBoxPopup);
-        gui->draw();
-        mainGraphics->updateScreen();
-        delete2(textBoxPopup);
-    }
-    SECTION("itemPopup")
-    {
-        CREATEWIDGETV0(itemPopup, ItemPopup);
-        gui->draw();
-        mainGraphics->updateScreen();
-        delete2(itemPopup);
-    }
-    SECTION("spellPopup")
-    {
-        CREATEWIDGETV0(spellPopup, SpellPopup);
-        gui->draw();
-        mainGraphics->updateScreen();
-        delete2(spellPopup);
-    }
-    SECTION("StatusPopup")
-    {
-        StatusPopup *status = CREATEWIDGETR0(StatusPopup);
-        gui->draw();
-        mainGraphics->updateScreen();
-        delete2(status);
-    }
-    SECTION("desktop")
-    {
-        CREATEWIDGETV(desktop, Desktop, nullptr);
-        gui->draw();
-        mainGraphics->updateScreen();
-        delete2(desktop);
-    }
-    SECTION("connectionDialog")
-    {
-        ConnectionDialog *connectionDialog = CREATEWIDGETR(ConnectionDialog,
-            // TRANSLATORS: connection dialog header
-            _("Logging in"),
-            State::SWITCH_SERVER);
-        gui->draw();
-        mainGraphics->updateScreen();
-        delete2(connectionDialog);
-    }
-
-    UnitsDb::unload();
-    delete2(localPlayer);
-    delete2(userPalette);
-    delete2(client);
-    delete2(serverFeatures);
-    delete2(inventoryHandler);
-    delete2(charServerHandler);
-    delete2(playerHandler);
-    delete2(gui);
-    ResourceManager::deleteInstance();
-    VirtFs::unmountDirSilent("data");
-    VirtFs::unmountDirSilent("../data");
-    VirtFs::unmountDirSilent("data/test");
-    VirtFs::unmountDirSilent("../data/test");
-}
-
-TEST_CASE("WindowManager", "create windows")
-{
-    setEnv("SDL_VIDEODRIVER", "dummy");
-
-    client = new Client;
-    XML::initXML();
-    SDL_Init(SDL_INIT_VIDEO);
-    ResourceManager::deleteInstance();
-    ResourceManager::cleanOrphans(true);
-    VirtFs::mountDirSilent("data", Append_false);
-    VirtFs::mountDirSilent("../data", Append_false);
-    VirtFs::mountDirSilent("data/test", Append_false);
-    VirtFs::mountDirSilent("../data/test", Append_false);
-    setPathsDefaults(paths);
-    branding.setValue("onlineServerFile", "test/serverlistplus.xml");
-    mainGraphics = new SDLGraphics;
-    imageHelper = new SDLImageHelper;
-
-    Dirs::initRootDir();
-    Dirs::initHomeDir();
-
-    const std::string cfgName = settings.configDir +
-        "/nonexistserver/config.xml";
-    ::remove(cfgName.c_str());
-
-    ConfigManager::initConfiguration();
-    setConfigDefaults2(config);
-    setBrandingDefaults(branding);
-    ConfigManager::initServerConfig("nonexistserver");
-
-#ifdef USE_SDL2
-    SDLImageHelper::setRenderer(graphicsManager.createRenderer(
-        graphicsManager.createWindow(640, 480, 0,
-        SDL_WINDOW_SHOWN | SDL_SWSURFACE), SDL_RENDERER_SOFTWARE));
-#else  // USE_SDL2
-
-    graphicsManager.createWindow(640, 480, 0, SDL_ANYFORMAT | SDL_SWSURFACE);
-#endif  // USE_SDL2
-
-    config.setValue("fontSize", 16);
-
-    theme = new Theme;
-    Theme::selectSkin();
-
-    localPlayer = new LocalPlayer(static_cast<BeingId>(1),
-        BeingTypeId_zero);
-
-    ActorSprite::load();
-    gui = new Gui();
-    gui->postInit(mainGraphics);
-    touchManager.init();
-    UnitsDb::load();
-    charServerHandler = new EAthena::CharServerHandler;
-    serverFeatures = new EAthena::ServerFeatures;
-    inventoryHandler = new EAthena::InventoryHandler;
-    playerHandler = new EAthena::PlayerHandler;
-    paths.setValue("itemIcons", "");
-
-    TranslationManager::init();
-
-    mainGraphics->setVideoMode(640, 480,
-        1,
-        8,
-        false,
-        false,
-        false,
-        false,
-        false);
-
-    SECTION("create windows")
-    {
-        WindowManager::createWindows();
-        WindowManager::deleteWindows();
-    }
-
-    SECTION("init")
-    {
-        WindowManager::init();
-    }
-
-    SECTION("initTitle")
-    {
-        WindowManager::initTitle();
-        REQUIRE(settings.windowCaption == strprintf("%s %s",
-            branding.getStringValue("appName").c_str(),
-            SMALL_VERSION));
-    }
-
-    SECTION("updateTitle1")
-    {
-        settings.serverName = std::string();
-        settings.login = std::string();
-        WindowManager::updateTitle();
-        REQUIRE(settings.windowCaption == strprintf("%s %s",
-            branding.getStringValue("appName").c_str(),
-            SMALL_VERSION));
-    }
-
-    SECTION("updateTitle2")
-    {
-        settings.serverName = "server";
-        settings.login = std::string();
-        WindowManager::updateTitle();
-        REQUIRE(settings.windowCaption == strprintf("%s %s - %s",
-            branding.getStringValue("appName").c_str(),
-            SMALL_VERSION,
-            settings.serverName.c_str()));
-    }
-
-    SECTION("updateTitle3")
-    {
-        settings.serverName = "server";
-        settings.login = "login";
-        WindowManager::updateTitle();
-        REQUIRE(settings.windowCaption == strprintf("%s %s - %s %s",
-            branding.getStringValue("appName").c_str(),
-            SMALL_VERSION,
-            settings.login.c_str(),
-            settings.serverName.c_str()));
-    }
-
-    SECTION("setFramerate1")
-    {
-        settings.limitFps = true;
-        WindowManager::setFramerate(60);
-        REQUIRE(WindowManager::getFramerate() == 60);
-        WindowManager::setFramerate(10);
-        REQUIRE(WindowManager::getFramerate() == 10);
-        WindowManager::setFramerate(0);
-        REQUIRE(WindowManager::getFramerate() == 10);
-    }
-
-    SECTION("setFramerate2")
-    {
-        settings.limitFps = false;
-        WindowManager::setFramerate(60);
-        REQUIRE(WindowManager::getFramerate() == 0);
-        WindowManager::setFramerate(10);
-        REQUIRE(WindowManager::getFramerate() == 0);
-        WindowManager::setFramerate(0);
-        REQUIRE(WindowManager::getFramerate() == 0);
-    }
-
-    settings.serverName = std::string();
-    settings.login = std::string();
-    settings.limitFps = true;
-
-    UnitsDb::unload();
-    delete2(localPlayer);
-    delete2(client);
-    delete2(serverFeatures);
-    delete2(inventoryHandler);
-    delete2(charServerHandler);
-    delete2(playerHandler);
-    delete2(gui);
-    ResourceManager::deleteInstance();
-    VirtFs::unmountDirSilent("data");
-    VirtFs::unmountDirSilent("../data");
-    VirtFs::unmountDirSilent("data/test");
-    VirtFs::unmountDirSilent("../data/test");
-}
diff --git a/src/unittests/integrity.cc b/src/unittests/integrity.cc
deleted file mode 100644
index 3cb4f3dc5..000000000
--- a/src/unittests/integrity.cc
+++ /dev/null
@@ -1,360 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2013-2017  The ManaPlus Developers
- *
- *  This file is part of The ManaPlus Client.
- *
- *  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
- *  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, see <http://www.gnu.org/licenses/>.
- */
-
-#include "unittests/unittests.h"
-
-#include "configmanager.h"
-#include "configuration.h"
-#include "client.h"
-#include "dirs.h"
-#include "graphicsmanager.h"
-
-#include "being/actorsprite.h"
-
-#include "fs/files.h"
-
-#include "fs/virtfs/fs.h"
-#include "fs/virtfs/rwops.h"
-
-#include "gui/userpalette.h"
-#include "gui/theme.h"
-
-#include "input/inputactionmap.h"
-
-#include "resources/image/image.h"
-
-#include "resources/loaders/imageloader.h"
-
-#include "resources/sdlimagehelper.h"
-#ifdef USE_SDL2
-#include "resources/surfaceimagehelper.h"
-#endif  // USE_SDL2
-
-#include "resources/resourcemanager/resourcemanager.h"
-
-#include "utils/env.h"
-#include "utils/delete2.h"
-#include "utils/foreach.h"
-
-PRAGMA48(GCC diagnostic push)
-PRAGMA48(GCC diagnostic ignored "-Wshadow")
-#include <SDL_image.h>
-PRAGMA48(GCC diagnostic pop)
-
-#ifndef UNITTESTS_CATCH
-#include <algorithm>
-#endif  // UNITTESTS_CATCH
-
-#include "debug.h"
-
-namespace
-{
-    class InputActionSortFunctorTest final
-    {
-        public:
-            bool operator() (const InputActionT key1,
-                             const InputActionT key2) const
-            {
-                REQUIRE(CAST_SIZE(key1) < CAST_SIZE(InputAction::TOTAL));
-                REQUIRE(CAST_SIZE(key2) < CAST_SIZE(InputAction::TOTAL));
-                REQUIRE(key1 < InputAction::TOTAL);
-                REQUIRE(key2 < InputAction::TOTAL);
-                return keys[CAST_SIZE(key1)].priority
-                    >= keys[CAST_SIZE(key2)].priority;
-            }
-
-            const InputActionData *keys A_NONNULLPOINTER;
-    };
-    InputActionSortFunctorTest inputActionDataSorterTest;
-}  // namespace
-
-static bool compareBuffers(const unsigned char *const buf2)
-{
-    bool isCorrect(true);
-    int sz = 0;
-    const unsigned char *buf1 = reinterpret_cast<const unsigned char*>(
-        VirtFs::loadFile("hide.png", sz));
-    REQUIRE(buf1 != nullptr);
-    REQUIRE(sz == 368);
-    for (int f = 0; f < sz; f ++)
-    {
-        if (buf1[f] != buf2[f])
-        {
-            isCorrect = false;
-            logger->log("Wrong buffer chars: 0x%x vs 0x%x",
-                buf1[f],
-                buf2[f]);
-        }
-    }
-    delete [] buf1;
-    return isCorrect;
-}
-
-TEST_CASE("integrity tests", "integrity")
-{
-    setEnv("SDL_VIDEODRIVER", "dummy");
-
-    client = new Client;
-    XML::initXML();
-    SDL_Init(SDL_INIT_VIDEO);
-    std::string name("data/test/test.zip");
-    std::string prefix;
-    if (Files::existsLocal(name) == false)
-        prefix = "../" + prefix;
-
-    VirtFs::mountDirSilent("data", Append_false);
-    VirtFs::mountDirSilent("../data", Append_false);
-
-    Dirs::initRootDir();
-    Dirs::initHomeDir();
-
-    setBrandingDefaults(branding);
-    ConfigManager::initConfiguration();
-
-#ifdef USE_SDL2
-    imageHelper = new SurfaceImageHelper;
-
-    SDLImageHelper::setRenderer(graphicsManager.createRenderer(
-        graphicsManager.createWindow(640, 480, 0,
-        SDL_WINDOW_SHOWN | SDL_SWSURFACE), SDL_RENDERER_SOFTWARE));
-#else  // USE_SDL2
-
-    imageHelper = new SDLImageHelper();
-
-    graphicsManager.createWindow(640, 480, 0, SDL_ANYFORMAT | SDL_SWSURFACE);
-#endif  // USE_SDL2
-
-    userPalette = new UserPalette;
-
-    config.setValue("fontSize", 16);
-    theme = new Theme;
-    Theme::selectSkin();
-
-    ActorSprite::load();
-    const char *const name1 = "dir/hide.png";
-    const int size1 = 368;
-
-    SECTION("integrity test 1")
-    {
-        REQUIRE(sizeof(inputActionData) / sizeof(InputActionData) ==
-            CAST_SIZE(InputAction::TOTAL));
-    }
-
-    SECTION("integrity test 2")
-    {
-        KeyToActionMap actionMap;
-        const size_t sz = CAST_SIZE(InputAction::TOTAL);
-        for (size_t i = 0; i < sz; i ++)
-        {
-            InputActionT val = static_cast<InputActionT>(i);
-            REQUIRE(val < InputAction::TOTAL);
-            REQUIRE(val > InputAction::NO_VALUE);
-            REQUIRE(val > InputAction::UNDEFINED_VALUE);
-            REQUIRE(CAST_SIZE(val) < CAST_SIZE(InputAction::TOTAL));
-            REQUIRE(CAST_SIZE(val) < CAST_SIZE(InputAction::NO_VALUE));
-            REQUIRE(CAST_SIZE(val) < CAST_SIZE(InputAction::UNDEFINED_VALUE));
-            REQUIRE(CAST_S32(val) < CAST_S32(InputAction::TOTAL));
-            REQUIRE(CAST_S32(val) > CAST_S32(InputAction::NO_VALUE));
-            REQUIRE(CAST_S32(val) > CAST_S32(InputAction::UNDEFINED_VALUE));
-        }
-    }
-
-    SECTION("integrity test 3")
-    {
-        KeyToActionMap actionMap;
-        int cnt = 0;
-        const size_t sz = CAST_SIZE(InputAction::TOTAL);
-        for (size_t i = 0; i < sz; i ++)
-        {
-            actionMap[cnt++].push_back(static_cast<InputActionT>(i));
-            if (cnt > 3)
-                cnt = 0;
-        }
-        FOR_EACH (KeyToActionMapIter, it, actionMap)
-        {
-            KeysVector *const keys = &it->second;
-            FOR_EACHP (KeysVectorIter, itk, keys)
-            {
-                const size_t val = CAST_SIZE(*itk);
-                REQUIRE(val < sz);
-            }
-        }
-    }
-
-    SECTION("integrity test 4")
-    {
-        KeyToActionMap actionMap;
-        KeyTimeMap keyTimeMap;
-        actionMap.clear();
-        keyTimeMap.clear();
-
-        for (size_t i = 0; i < CAST_SIZE(InputAction::TOTAL); i ++)
-        {
-            actionMap[10].push_back(
-                static_cast<InputActionT>(i));
-        }
-
-        KeysVector *const keys = &actionMap[0];
-        inputActionDataSorterTest.keys = &inputActionData[0];
-        std::sort(keys->begin(), keys->end(), inputActionDataSorterTest);
-    }
-
-    SECTION("integrity test 5")
-    {
-        KeyToActionMap mKeyToAction;
-        KeyToIdMap mKeyToId;
-        KeyTimeMap mKeyTimeMap;
-        inputManager.updateKeyActionMap(mKeyToAction, mKeyToId,
-            mKeyTimeMap, InputType::KEYBOARD);
-    }
-
-    SECTION("integrity Loader::getImage test 1")
-    {
-        Image *const image = Loader::getImage(
-            "graphics/images/login_wallpaper.png");
-        REQUIRE(image != nullptr);
-        REQUIRE(image->getSDLSurface() != nullptr);
-        image->decRef();
-    }
-
-    SECTION("integrity Loader::getImage test 2")
-    {
-        VirtFs::mountZip(prefix + "data/test/test.zip", Append_false);
-        Image *const image = Loader::getImage(
-            "dir/hide.png");
-        VirtFs::unmountZip(prefix + "data/test/test.zip");
-        REQUIRE(image != nullptr);
-        REQUIRE(image->getSDLSurface() != nullptr);
-        image->decRef();
-    }
-
-    SECTION("integrity Loader::getImage test 3")
-    {
-        VirtFs::mountZip(prefix + "data/test/test.zip", Append_false);
-        Image *const image = Loader::getImage(
-            "dir/brimmedhat.png");
-        VirtFs::unmountZip(prefix + "data/test/test.zip");
-        REQUIRE(image != nullptr);
-        REQUIRE(image->getSDLSurface() != nullptr);
-        image->decRef();
-    }
-
-    SECTION("integrity Loader::getImage test 4")
-    {
-        VirtFs::mountZip(prefix + "data/test/test.zip", Append_false);
-
-        SDL_RWops *const rw = VirtFs::rwopsOpenRead(name1);
-        REQUIRE(rw != nullptr);
-        unsigned char buf[size1];
-        const size_t sz = SDL_RWread(rw, buf, 1, size1);
-        if (sz != size1)
-            SDL_RWclose(rw);
-        REQUIRE(sz == size1);
-        SDL_RWclose(rw);
-        VirtFs::unmountZip(prefix + "data/test/test.zip");
-        VirtFs::mountDirSilent(prefix + "data/test", Append_true);
-        REQUIRE(compareBuffers(buf));
-        VirtFs::unmountDirSilent(prefix + "data/test");
-    }
-
-    SECTION("integrity Loader::getImage test 7")
-    {
-        VirtFs::mountZip(prefix + "data/test/test.zip", Append_false);
-
-        SDL_RWops *const rw = VirtFs::rwopsOpenRead(name1);
-        REQUIRE(rw != nullptr);
-        int64_t seek = SDL_RWseek(rw, 0, RW_SEEK_END);
-        if (seek == -1)
-            SDL_RWclose(rw);
-        REQUIRE(seek != -1);
-        const int64_t pos = SDL_RWtell(rw);
-        if (pos != size1)
-            SDL_RWclose(rw);
-        REQUIRE(pos == size1);
-
-        seek = SDL_RWseek(rw, 0, RW_SEEK_SET);
-        if (seek == -1)
-            SDL_RWclose(rw);
-        REQUIRE(seek != -1);
-
-        unsigned char buf[size1];
-        const size_t sz = SDL_RWread(rw, buf, 1, pos);
-        if (sz != size1)
-            SDL_RWclose(rw);
-        REQUIRE(sz == size1);
-
-        SDL_RWclose(rw);
-        VirtFs::unmountZip(prefix + "data/test/test.zip");
-        VirtFs::mountDirSilent("data/test", Append_true);
-        VirtFs::mountDirSilent("../data/test", Append_true);
-        REQUIRE(compareBuffers(buf));
-        VirtFs::unmountDirSilent("data/test");
-        VirtFs::unmountDirSilent("../data/test");
-    }
-
-    SECTION("integrity Loader::getImage test 8")
-    {
-        VirtFs::mountZip(prefix + "data/test/test.zip", Append_false);
-
-        SDL_RWops *const rw = VirtFs::rwopsOpenRead(name1);
-        REQUIRE(rw != nullptr);
-        if (IMG_isPNG(rw) == 0)
-        {
-            SDL_RWclose(rw);
-            REQUIRE(false);
-        }
-        SDL_Surface *const tmpImage = IMG_LoadPNG_RW(rw);
-        SDL_RWclose(rw);
-        VirtFs::unmountZip(prefix + "data/test/test.zip");
-        REQUIRE(tmpImage != nullptr);
-        SDL_FreeSurface(tmpImage);
-    }
-
-    SECTION("integrity Loader::getImage test 9")
-    {
-        VirtFs::mountZip(prefix + "data/test/test.zip", Append_false);
-
-        SDL_RWops *const rw = VirtFs::rwopsOpenRead(name1);
-        REQUIRE(rw != nullptr);
-        Resource *const res = imageHelper->load(rw);
-        VirtFs::unmountZip(prefix + "data/test/test.zip");
-        REQUIRE(res != nullptr);
-        delete res;
-    }
-
-    SECTION("integrity Loader::getImage test 10")
-    {
-        VirtFs::mountZip(prefix + "data/test/test.zip", Append_false);
-        Image *const image = Loader::getImage(
-            name1);
-        VirtFs::unmountZip(prefix + "data/test/test.zip");
-        REQUIRE(image != nullptr);
-        REQUIRE(image->getSDLSurface() != nullptr);
-        image->decRef();
-    }
-
-    ResourceManager::cleanOrphans(true);
-
-    delete2(userPalette);
-    delete2(client);
-
-    VirtFs::unmountDirSilent("data");
-    VirtFs::unmountDirSilent("../data");
-}
diff --git a/src/unittests/render/mockdrawitem.h b/src/unittests/render/mockdrawitem.h
deleted file mode 100644
index 75951123e..000000000
--- a/src/unittests/render/mockdrawitem.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2017  The ManaPlus Developers
- *
- *  This file is part of The ManaPlus Client.
- *
- *  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
- *  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, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef RENDER_MOCKDRAWITEM_H
-#define RENDER_MOCKDRAWITEM_H
-
-#ifdef UNITTESTS
-
-#include "unittests/enums/render/mockdrawtype.h"
-
-#include "localconsts.h"
-
-class Image;
-
-struct MockDrawItem final
-{
-    MockDrawItem(const MockDrawTypeT type,
-                 const Image *const image0,
-                 const int x0,
-                 const int y0,
-                 const int width0,
-                 const int height0) :
-        image(image0),
-        drawType(type),
-        x(x0),
-        y(y0),
-        width(width0),
-        height(height0)
-    {
-    }
-
-    A_DEFAULT_COPY(MockDrawItem)
-
-    const Image *image;
-    MockDrawTypeT drawType;
-    int x;
-    int y;
-    int width;
-    int height;
-};
-
-#endif  // UNITTESTS
-#endif  // RENDER_MOCKDRAWITEM_H
diff --git a/src/unittests/render/mockgraphics.cc b/src/unittests/render/mockgraphics.cc
deleted file mode 100644
index 29aa19af6..000000000
--- a/src/unittests/render/mockgraphics.cc
+++ /dev/null
@@ -1,302 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2004-2009  The Mana World Development Team
- *  Copyright (C) 2009-2010  The Mana Developers
- *  Copyright (C) 2011-2017  The ManaPlus Developers
- *
- *  This file is part of The ManaPlus Client.
- *
- *  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
- *  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, see <http://www.gnu.org/licenses/>.
- */
-
-#include "unittests/render/mockgraphics.h"
-
-#include "graphicsmanager.h"
-
-#include "utils/sdlcheckutils.h"
-
-#include "render/vertexes/imagecollection.h"
-
-#include "debug.h"
-
-MockGraphics::MockGraphics() :
-    Graphics()
-{
-    mOpenGL = RENDER_SOFTWARE;
-    mName = "Software";
-}
-
-MockGraphics::~MockGraphics()
-{
-}
-
-void MockGraphics::drawRescaledImage(const Image *restrict const image
-                                     A_UNUSED,
-                                     int dstX A_UNUSED,
-                                     int dstY A_UNUSED,
-                                     const int desiredWidth A_UNUSED,
-                                     const int desiredHeight A_UNUSED)
-                                     restrict2
-{
-}
-
-void MockGraphics::drawImage(const Image *restrict const image,
-                             int dstX,
-                             int dstY) restrict2
-{
-    mDraws.push_back(MockDrawItem(MockDrawType::DrawImage,
-        image,
-        dstX,
-        dstY,
-        0,
-        0));
-}
-
-void MockGraphics::drawImageInline(const Image *restrict const image A_UNUSED,
-                                   int dstX A_UNUSED,
-                                   int dstY A_UNUSED) restrict2
-{
-}
-
-void MockGraphics::copyImage(const Image *restrict const image A_UNUSED,
-                             int dstX A_UNUSED,
-                             int dstY A_UNUSED) restrict2
-{
-}
-
-void MockGraphics::drawImageCached(const Image *restrict const image A_UNUSED,
-                                   int x A_UNUSED,
-                                   int y A_UNUSED) restrict2
-{
-}
-
-void MockGraphics::drawPatternCached(const Image *restrict const image
-                                     A_UNUSED,
-                                     const int x A_UNUSED,
-                                     const int y A_UNUSED,
-                                     const int w A_UNUSED,
-                                     const int h A_UNUSED) restrict2
-{
-}
-
-void MockGraphics::completeCache() restrict2
-{
-}
-
-void MockGraphics::drawPattern(const Image *restrict const image,
-                               const int x,
-                               const int y,
-                               const int w,
-                               const int h) restrict2
-{
-    mDraws.push_back(MockDrawItem(MockDrawType::DrawPattern,
-        image,
-        x,
-        y,
-        w,
-        h));
-}
-
-void MockGraphics::drawPatternInline(const Image *restrict const image
-                                     A_UNUSED,
-                                     const int x A_UNUSED,
-                                     const int y A_UNUSED,
-                                     const int w A_UNUSED,
-                                     const int h A_UNUSED) restrict2
-{
-}
-
-void MockGraphics::drawRescaledPattern(const Image *restrict const image
-                                       A_UNUSED,
-                                       const int x A_UNUSED,
-                                       const int y A_UNUSED,
-                                       const int w A_UNUSED,
-                                       const int h A_UNUSED,
-                                       const int scaledWidth A_UNUSED,
-                                       const int scaledHeight A_UNUSED)
-                                       restrict2
-{
-}
-
-void MockGraphics::calcPattern(ImageVertexes *restrict const vert A_UNUSED,
-                               const Image *restrict const image A_UNUSED,
-                               const int x A_UNUSED,
-                               const int y A_UNUSED,
-                               const int w A_UNUSED,
-                               const int h A_UNUSED) const restrict2
-{
-}
-
-void MockGraphics::calcPatternInline(ImageVertexes *restrict const vert
-                                     A_UNUSED,
-                                     const Image *restrict const image
-                                     A_UNUSED,
-                                     const int x A_UNUSED,
-                                     const int y A_UNUSED,
-                                     const int w A_UNUSED,
-                                     const int h A_UNUSED) const restrict2
-{
-}
-
-void MockGraphics::calcPattern(ImageCollection *restrict const vertCol
-                               A_UNUSED,
-                               const Image *restrict const image A_UNUSED,
-                               const int x A_UNUSED,
-                               const int y A_UNUSED,
-                               const int w A_UNUSED,
-                               const int h A_UNUSED) const restrict2
-{
-}
-
-void MockGraphics::calcTileVertexes(ImageVertexes *restrict const vert,
-                                   const Image *restrict const image,
-                                   int x, int y) const restrict2
-{
-    vert->image = image;
-    calcTileSDL(vert, x, y);
-}
-
-void MockGraphics::calcTileVertexesInline(ImageVertexes *restrict const vert
-                                          A_UNUSED,
-                                          const Image *restrict const image
-                                          A_UNUSED,
-                                          int x A_UNUSED,
-                                          int y A_UNUSED) const restrict2
-{
-}
-
-void MockGraphics::calcTileSDL(ImageVertexes *restrict const vert A_UNUSED,
-                               int x A_UNUSED,
-                               int y A_UNUSED) const restrict2
-{
-}
-
-void MockGraphics::calcTileCollection(ImageCollection *restrict const vertCol
-                                      A_UNUSED,
-                                      const Image *restrict const image
-                                      A_UNUSED,
-                                      int x A_UNUSED,
-                                      int y A_UNUSED) restrict2
-{
-}
-
-void MockGraphics::drawTileCollection(const ImageCollection *restrict const
-                                      vertCol A_UNUSED) restrict2
-{
-}
-
-void MockGraphics::drawTileVertexes(const ImageVertexes *restrict const
-                                    vert A_UNUSED) restrict2
-{
-}
-
-void MockGraphics::updateScreen() restrict2
-{
-}
-
-void MockGraphics::calcWindow(ImageCollection *restrict const vertCol A_UNUSED,
-                              const int x A_UNUSED,
-                              const int y A_UNUSED,
-                              const int w A_UNUSED,
-                              const int h A_UNUSED,
-                              const ImageRect &restrict imgRect A_UNUSED)
-                              restrict2
-{
-}
-
-void MockGraphics::fillRectangle(const Rect &restrict rectangle A_UNUSED)
-                                 restrict2
-{
-}
-
-void MockGraphics::beginDraw() restrict2
-{
-    pushClipArea(Rect(0, 0, mRect.w, mRect.h));
-}
-
-void MockGraphics::endDraw() restrict2
-{
-    popClipArea();
-}
-
-void MockGraphics::pushClipArea(const Rect &restrict area) restrict2
-{
-    Graphics::pushClipArea(area);
-}
-
-void MockGraphics::popClipArea() restrict2
-{
-    Graphics::popClipArea();
-}
-
-void MockGraphics::drawPoint(int x A_UNUSED,
-                             int y A_UNUSED) restrict2
-{
-}
-
-void MockGraphics::drawRectangle(const Rect &restrict rectangle A_UNUSED)
-                                 restrict2
-{
-}
-
-void MockGraphics::drawLine(int x1 A_UNUSED,
-                            int y1 A_UNUSED,
-                            int x2 A_UNUSED,
-                            int y2 A_UNUSED) restrict2
-{
-}
-
-bool MockGraphics::setVideoMode(const int w, const int h,
-                               const int scale,
-                               const int bpp,
-                               const bool fs,
-                               const bool hwaccel,
-                               const bool resize,
-                               const bool noFrame,
-                               const bool allowHighDPI) restrict2
-{
-    setMainFlags(w, h, scale, bpp, fs, hwaccel, resize, noFrame, allowHighDPI);
-
-    if ((mWindow = graphicsManager.createWindow(w, h, bpp,
-        getSoftwareFlags())) == nullptr)
-    {
-        mRect.w = 0;
-        mRect.h = 0;
-        return false;
-    }
-
-    mRect.w = CAST_U16(mRect.w);
-    mRect.h = CAST_U16(mRect.h);
-
-    return videoInfo();
-}
-
-void MockGraphics::drawImageRect(const int x A_UNUSED,
-                                 const int y A_UNUSED,
-                                 const int w A_UNUSED,
-                                 const int h A_UNUSED,
-                                 const ImageRect &restrict imgRect A_UNUSED)
-                                 restrict2
-{
-}
-
-void MockGraphics::calcImageRect(ImageVertexes *restrict const vert A_UNUSED,
-                                 const int x A_UNUSED,
-                                 const int y A_UNUSED,
-                                 const int w A_UNUSED,
-                                 const int h A_UNUSED,
-                                 const ImageRect &restrict imgRect A_UNUSED)
-                                 restrict2
-{
-}
diff --git a/src/unittests/render/mockgraphics.h b/src/unittests/render/mockgraphics.h
deleted file mode 100644
index e144cef02..000000000
--- a/src/unittests/render/mockgraphics.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2004-2009  The Mana World Development Team
- *  Copyright (C) 2009-2010  The Mana Developers
- *  Copyright (C) 2011-2017  The ManaPlus Developers
- *
- *  This file is part of The ManaPlus Client.
- *
- *  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
- *  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, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef RENDER_MOCKGRAPHICS_H
-#define RENDER_MOCKGRAPHICS_H
-
-#ifdef UNITTESTS
-
-#include "render/graphics.h"
-
-#include "unittests/render/mockdrawitem.h"
-
-#include "utils/vector.h"
-
-#include "localconsts.h"
-
-class MockGraphics final : public Graphics
-{
-    public:
-        MockGraphics();
-
-        A_DELETE_COPY(MockGraphics)
-
-        ~MockGraphics();
-
-        #include "render/graphicsdef.hpp"
-        RENDER_GRAPHICSDEF_HPP
-
-        #include "render/softwaregraphicsdef.hpp"
-        RENDER_SOFTWAREGRAPHICSDEF_HPP
-
-        STD_VECTOR<MockDrawItem> mDraws;
-};
-
-#endif  // UNITTESTS
-#endif  // RENDER_MOCKGRAPHICS_H
diff --git a/src/unittests/resources/dye/dye.cc b/src/unittests/resources/dye/dye.cc
deleted file mode 100644
index a0294a84f..000000000
--- a/src/unittests/resources/dye/dye.cc
+++ /dev/null
@@ -1,2014 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2013-2017  The ManaPlus Developers
- *
- *  This file is part of The ManaPlus Client.
- *
- *  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
- *  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, see <http://www.gnu.org/licenses/>.
- */
-
-#include "unittests/unittests.h"
-
-#include "client.h"
-#include "configmanager.h"
-#include "configuration.h"
-#include "dirs.h"
-#include "graphicsmanager.h"
-
-#include "being/actorsprite.h"
-
-#include "fs/virtfs/fs.h"
-
-#include "gui/userpalette.h"
-#include "gui/theme.h"
-
-#include "resources/sdlimagehelper.h"
-#ifdef USE_SDL2
-#include "resources/surfaceimagehelper.h"
-#endif  // USE_SDL2
-
-#include "resources/dye/dye.h"
-#include "resources/dye/dyepalette.h"
-
-#include "resources/image/image.h"
-
-#include "resources/loaders/imageloader.h"
-
-#include "utils/delete2.h"
-#include "utils/env.h"
-
-PRAGMA48(GCC diagnostic push)
-PRAGMA48(GCC diagnostic ignored "-Wshadow")
-#ifndef USE_SDL2
-#include <SDL.h>
-#endif  // USE_SDL2
-PRAGMA48(GCC diagnostic pop)
-
-#include "debug.h"
-
-#ifdef USE_OPENGL
-
-TEST_CASE("Dye replaceSOGLColor 1 1", "")
-{
-    DyePalette palette("#00ff00,000011", 6);
-    uint32_t data[1];
-    data[0] = buildHex(0x01, 0x02, 0x03, 0x10);
-    DYEPALETTE(palette, SOGLColor)(&data[0], 1);
-    REQUIRE(data[0] == buildHex(0x01, 0x02, 0x03, 0x10));
-}
-
-TEST_CASE("Dye replaceSOGLColor 1 2", "")
-{
-    DyePalette palette("#01ff02,030411", 6);
-    uint32_t data[1];
-    data[0] = buildHex(0x20, 0x02, 0xff, 0x01);
-    DYEPALETTE(palette, SOGLColor)(&data[0], 1);
-    REQUIRE(data[0] == buildHex(0x20, 0x11, 0x04, 0x03));
-}
-
-TEST_CASE("Dye replaceSOGLColor 1 3", "")
-{
-    DyePalette palette("#404040,200000,0100ee,102030", 6);
-    uint32_t data[1];
-    data[0] = buildHex(0x40, 0xee, 0x00, 0x01);
-    DYEPALETTE(palette, SOGLColor)(&data[0], 1);
-    REQUIRE(data[0] == buildHex(0x40, 0x30, 0x20, 0x10));
-}
-
-TEST_CASE("Dye replaceSOGLColor 2 1", "")
-{
-    DyePalette palette("#01ff02,030411", 6);
-    uint32_t data[2];
-    data[0] = buildHex(0x20, 0x02, 0xff, 0x01);
-    data[1] = buildHex(0x30, 0x02, 0xff, 0x01);
-    DYEPALETTE(palette, SOGLColor)(&data[0], 2);
-    REQUIRE(data[0] == buildHex(0x20, 0x11, 0x04, 0x03));
-    REQUIRE(data[1] == buildHex(0x30, 0x11, 0x04, 0x03));
-}
-
-TEST_CASE("Dye replaceSOGLColor 4 1", "")
-{
-    DyePalette palette("#01ff02,030411", 6);
-    uint32_t data[4];
-    data[0] = buildHex(0x20, 0x02, 0xff, 0x01);
-    data[1] = buildHex(0x30, 0x02, 0xff, 0x01);
-    data[2] = buildHex(0x40, 0x02, 0xff, 0x01);
-    data[3] = buildHex(0x50, 0x02, 0xff, 0x02);
-    DYEPALETTE(palette, SOGLColor)(&data[0], 4);
-    REQUIRE(data[0] == buildHex(0x20, 0x11, 0x04, 0x03));
-    REQUIRE(data[1] == buildHex(0x30, 0x11, 0x04, 0x03));
-    REQUIRE(data[2] == buildHex(0x40, 0x11, 0x04, 0x03));
-    REQUIRE(data[3] == buildHex(0x50, 0x02, 0xff, 0x02));
-}
-
-TEST_CASE("Dye replaceSOGLColor 8 1", "")
-{
-    DyePalette palette("#01ff02,030411,01ee02,010203", 6);
-    uint32_t data[8];
-    data[0] = buildHex(0x20, 0x02, 0xff, 0x01);
-    data[1] = buildHex(0x30, 0x02, 0xff, 0x01);
-    data[2] = buildHex(0x40, 0x02, 0xff, 0x01);
-    data[3] = buildHex(0x50, 0x02, 0xff, 0x02);
-    data[4] = buildHex(0x20, 0x02, 0xff, 0x01);
-    data[5] = buildHex(0x30, 0x02, 0xff, 0x01);
-    data[6] = buildHex(0x40, 0x02, 0xff, 0x01);
-    data[7] = buildHex(0x60, 0x02, 0xff, 0x02);
-    DYEPALETTE(palette, SOGLColor)(&data[0], 8);
-    REQUIRE(data[0] == buildHex(0x20, 0x11, 0x04, 0x03));
-    REQUIRE(data[1] == buildHex(0x30, 0x11, 0x04, 0x03));
-    REQUIRE(data[2] == buildHex(0x40, 0x11, 0x04, 0x03));
-    REQUIRE(data[3] == buildHex(0x50, 0x02, 0xff, 0x02));
-    REQUIRE(data[4] == buildHex(0x20, 0x11, 0x04, 0x03));
-    REQUIRE(data[5] == buildHex(0x30, 0x11, 0x04, 0x03));
-    REQUIRE(data[6] == buildHex(0x40, 0x11, 0x04, 0x03));
-    REQUIRE(data[7] == buildHex(0x60, 0x02, 0xff, 0x02));
-}
-
-TEST_CASE("Dye replaceSOGLColor 1 1 default", "")
-{
-    DyePalette palette("#00ff00,000011", 6);
-    uint32_t data[1];
-    data[0] = buildHex(0x01, 0x02, 0x03, 0x10);
-    palette.replaceSOGLColorDefault(&data[0], 1);
-    REQUIRE(data[0] == buildHex(0x01, 0x02, 0x03, 0x10));
-}
-
-TEST_CASE("Dye replaceSOGLColor 1 2 default", "")
-{
-    DyePalette palette("#01ff02,030411", 6);
-    uint32_t data[1];
-    data[0] = buildHex(0x20, 0x02, 0xff, 0x01);
-    palette.replaceSOGLColorDefault(&data[0], 1);
-    REQUIRE(data[0] == buildHex(0x20, 0x11, 0x04, 0x03));
-}
-
-TEST_CASE("Dye replaceSOGLColor 1 3 default", "")
-{
-    DyePalette palette("#404040,200000,0100ee,102030", 6);
-    uint32_t data[1];
-    data[0] = buildHex(0x40, 0xee, 0x00, 0x01);
-    palette.replaceSOGLColorDefault(&data[0], 1);
-    REQUIRE(data[0] == buildHex(0x40, 0x30, 0x20, 0x10));
-}
-
-TEST_CASE("Dye replaceSOGLColor 2 1 default", "")
-{
-    DyePalette palette("#01ff02,030411", 6);
-    uint32_t data[2];
-    data[0] = buildHex(0x20, 0x02, 0xff, 0x01);
-    data[1] = buildHex(0x30, 0x02, 0xff, 0x01);
-    palette.replaceSOGLColorDefault(&data[0], 2);
-    REQUIRE(data[0] == buildHex(0x20, 0x11, 0x04, 0x03));
-    REQUIRE(data[1] == buildHex(0x30, 0x11, 0x04, 0x03));
-}
-
-TEST_CASE("Dye replaceSOGLColor 4 1 default", "")
-{
-    DyePalette palette("#01ff02,030411", 6);
-    uint32_t data[4];
-    data[0] = buildHex(0x20, 0x02, 0xff, 0x01);
-    data[1] = buildHex(0x30, 0x02, 0xff, 0x01);
-    data[2] = buildHex(0x40, 0x02, 0xff, 0x01);
-    data[3] = buildHex(0x50, 0x02, 0xff, 0x02);
-    palette.replaceSOGLColorDefault(&data[0], 4);
-    REQUIRE(data[0] == buildHex(0x20, 0x11, 0x04, 0x03));
-    REQUIRE(data[1] == buildHex(0x30, 0x11, 0x04, 0x03));
-    REQUIRE(data[2] == buildHex(0x40, 0x11, 0x04, 0x03));
-    REQUIRE(data[3] == buildHex(0x50, 0x02, 0xff, 0x02));
-}
-
-TEST_CASE("Dye replaceSOGLColor 8 1 default", "")
-{
-    DyePalette palette("#01ff02,030411,01ee02,010203", 6);
-    uint32_t data[8];
-    data[0] = buildHex(0x20, 0x02, 0xff, 0x01);
-    data[1] = buildHex(0x30, 0x02, 0xff, 0x01);
-    data[2] = buildHex(0x40, 0x02, 0xff, 0x01);
-    data[3] = buildHex(0x50, 0x02, 0xff, 0x02);
-    data[4] = buildHex(0x20, 0x02, 0xff, 0x01);
-    data[5] = buildHex(0x30, 0x02, 0xff, 0x01);
-    data[6] = buildHex(0x40, 0x02, 0xff, 0x01);
-    data[7] = buildHex(0x60, 0x02, 0xff, 0x02);
-    palette.replaceSOGLColorDefault(&data[0], 8);
-    REQUIRE(data[0] == buildHex(0x20, 0x11, 0x04, 0x03));
-    REQUIRE(data[1] == buildHex(0x30, 0x11, 0x04, 0x03));
-    REQUIRE(data[2] == buildHex(0x40, 0x11, 0x04, 0x03));
-    REQUIRE(data[3] == buildHex(0x50, 0x02, 0xff, 0x02));
-    REQUIRE(data[4] == buildHex(0x20, 0x11, 0x04, 0x03));
-    REQUIRE(data[5] == buildHex(0x30, 0x11, 0x04, 0x03));
-    REQUIRE(data[6] == buildHex(0x40, 0x11, 0x04, 0x03));
-    REQUIRE(data[7] == buildHex(0x60, 0x02, 0xff, 0x02));
-}
-
-TEST_CASE("Dye replaceSOGLColor 8 1 sse2", "")
-{
-    DyePalette palette("#01ff02,030411,01ee02,010203", 6);
-    uint32_t data[8];
-    data[0] = buildHex(0x20, 0x02, 0xff, 0x01);
-    data[1] = buildHex(0x30, 0x02, 0xff, 0x01);
-    data[2] = buildHex(0x40, 0x02, 0xff, 0x01);
-    data[3] = buildHex(0x50, 0x02, 0xff, 0x02);
-    data[4] = buildHex(0x20, 0x02, 0xff, 0x01);
-    data[5] = buildHex(0x30, 0x02, 0xff, 0x01);
-    data[6] = buildHex(0x40, 0x02, 0xff, 0x01);
-    data[7] = buildHex(0x60, 0x02, 0xff, 0x02);
-    DYEPALETTE(palette, SOGLColorSse2)(&data[0], 8);
-    REQUIRE(data[0] == buildHex(0x20, 0x11, 0x04, 0x03));
-    REQUIRE(data[1] == buildHex(0x30, 0x11, 0x04, 0x03));
-    REQUIRE(data[2] == buildHex(0x40, 0x11, 0x04, 0x03));
-    REQUIRE(data[3] == buildHex(0x50, 0x02, 0xff, 0x02));
-    REQUIRE(data[4] == buildHex(0x20, 0x11, 0x04, 0x03));
-    REQUIRE(data[5] == buildHex(0x30, 0x11, 0x04, 0x03));
-    REQUIRE(data[6] == buildHex(0x40, 0x11, 0x04, 0x03));
-    REQUIRE(data[7] == buildHex(0x60, 0x02, 0xff, 0x02));
-}
-
-TEST_CASE("Dye replaceSOGLColor 8 1 avx2", "")
-{
-    DyePalette palette("#01ff02,030411,01ee02,010203", 6);
-    uint32_t data[8];
-    data[0] = buildHex(0x20, 0x02, 0xff, 0x01);
-    data[1] = buildHex(0x30, 0x02, 0xff, 0x01);
-    data[2] = buildHex(0x40, 0x02, 0xff, 0x01);
-    data[3] = buildHex(0x50, 0x02, 0xff, 0x02);
-    data[4] = buildHex(0x20, 0x02, 0xff, 0x01);
-    data[5] = buildHex(0x30, 0x02, 0xff, 0x01);
-    data[6] = buildHex(0x40, 0x02, 0xff, 0x01);
-    data[7] = buildHex(0x60, 0x02, 0xff, 0x02);
-    DYEPALETTE(palette, SOGLColorAvx2)(&data[0], 8);
-    REQUIRE(data[0] == buildHex(0x20, 0x11, 0x04, 0x03));
-    REQUIRE(data[1] == buildHex(0x30, 0x11, 0x04, 0x03));
-    REQUIRE(data[2] == buildHex(0x40, 0x11, 0x04, 0x03));
-    REQUIRE(data[3] == buildHex(0x50, 0x02, 0xff, 0x02));
-    REQUIRE(data[4] == buildHex(0x20, 0x11, 0x04, 0x03));
-    REQUIRE(data[5] == buildHex(0x30, 0x11, 0x04, 0x03));
-    REQUIRE(data[6] == buildHex(0x40, 0x11, 0x04, 0x03));
-    REQUIRE(data[7] == buildHex(0x60, 0x02, 0xff, 0x02));
-}
-
-
-TEST_CASE("Dye replaceAOGLColor 1 1", "")
-{
-    DyePalette palette("#00ff0010,00001120", 8);
-    uint32_t data[1];
-    data[0] = buildHex(0x10, 0x03, 0x02, 0x01);
-    DYEPALETTE(palette, AOGLColor)(&data[0], 1);
-    REQUIRE(data[0] == buildHex(0x10, 0x03, 0x02, 0x01));
-}
-
-TEST_CASE("Dye replaceAOGLColor 1 2", "")
-{
-    DyePalette palette("#00ff0120,020311ff", 8);
-    uint32_t data[1];
-    data[0] = buildHex(0x20, 0x01, 0xff, 0x00);
-    DYEPALETTE(palette, AOGLColor)(&data[0], 1);
-    REQUIRE(data[0] == buildHex(0xff, 0x11, 0x03, 0x02));
-}
-
-TEST_CASE("Dye replaceAOGLColor 1 3", "")
-{
-    DyePalette palette("#40404040,20000000,0100ee40,102030ff", 8);
-    uint32_t data[1];
-    data[0] = buildHex(0x40, 0xee, 0x00, 0x01);
-    DYEPALETTE(palette, AOGLColor)(&data[0], 1);
-    REQUIRE(data[0] == buildHex(0xff, 0x30, 0x20, 0x10));
-}
-
-TEST_CASE("Dye replaceAOGLColor 2 1", "")
-{
-    DyePalette palette("#40404040,20000000,0100ee40,102030ff", 8);
-    uint32_t data[2];
-    data[0] = buildHex(0x40, 0xee, 0x00, 0x01);
-    data[1] = buildHex(0x40, 0xee, 0x00, 0x01);
-    DYEPALETTE(palette, AOGLColor)(&data[0], 2);
-    REQUIRE(data[0] == buildHex(0xff, 0x30, 0x20, 0x10));
-    REQUIRE(data[1] == buildHex(0xff, 0x30, 0x20, 0x10));
-}
-
-TEST_CASE("Dye replaceAOGLColor 4 1", "")
-{
-    DyePalette palette("#40404040,20000000,0100ee40,102030ff", 8);
-    uint32_t data[4];
-    data[0] = buildHex(0x40, 0xee, 0x00, 0x01);
-    data[1] = buildHex(0x40, 0xee, 0x00, 0x01);
-    data[2] = buildHex(0x41, 0xee, 0x00, 0x01);
-    data[3] = buildHex(0x40, 0xee, 0x00, 0x01);
-    DYEPALETTE(palette, AOGLColor)(&data[0], 4);
-    REQUIRE(data[0] == buildHex(0xff, 0x30, 0x20, 0x10));
-    REQUIRE(data[1] == buildHex(0xff, 0x30, 0x20, 0x10));
-    REQUIRE(data[2] == buildHex(0x41, 0xee, 0x00, 0x01));
-    REQUIRE(data[3] == buildHex(0xff, 0x30, 0x20, 0x10));
-}
-
-TEST_CASE("Dye replaceAOGLColor 8 1", "")
-{
-    DyePalette palette("#40404040,20000000,0100ee40,102030ff", 8);
-    uint32_t data[8];
-    data[0] = buildHex(0x40, 0xee, 0x00, 0x01);
-    data[1] = buildHex(0x40, 0xee, 0x00, 0x01);
-    data[2] = buildHex(0x41, 0xee, 0x00, 0x01);
-    data[3] = buildHex(0x40, 0xee, 0x00, 0x01);
-    data[4] = buildHex(0x40, 0xee, 0x00, 0x01);
-    data[5] = buildHex(0x40, 0x40, 0x40, 0x40);
-    data[6] = buildHex(0x41, 0xe0, 0x00, 0x01);
-    data[7] = buildHex(0x40, 0xee, 0x00, 0x01);
-    DYEPALETTE(palette, AOGLColor)(&data[0], 8);
-    REQUIRE(data[0] == buildHex(0xff, 0x30, 0x20, 0x10));
-    REQUIRE(data[1] == buildHex(0xff, 0x30, 0x20, 0x10));
-    REQUIRE(data[2] == buildHex(0x41, 0xee, 0x00, 0x01));
-    REQUIRE(data[3] == buildHex(0xff, 0x30, 0x20, 0x10));
-    REQUIRE(data[4] == buildHex(0xff, 0x30, 0x20, 0x10));
-    REQUIRE(data[5] == buildHex(0x00, 0x00, 0x00, 0x20));
-    REQUIRE(data[6] == buildHex(0x41, 0xe0, 0x00, 0x01));
-    REQUIRE(data[7] == buildHex(0xff, 0x30, 0x20, 0x10));
-}
-
-TEST_CASE("Dye replaceAOGLColor 1 1 default", "")
-{
-    DyePalette palette("#00ff0010,00001120", 8);
-    uint32_t data[1];
-    data[0] = buildHex(0x10, 0x03, 0x02, 0x01);
-    palette.replaceAOGLColorDefault(&data[0], 1);
-    REQUIRE(data[0] == buildHex(0x10, 0x03, 0x02, 0x01));
-}
-
-TEST_CASE("Dye replaceAOGLColor 1 2 default", "")
-{
-    DyePalette palette("#00ff0120,020311ff", 8);
-    uint32_t data[1];
-    data[0] = buildHex(0x20, 0x01, 0xff, 0x00);
-    palette.replaceAOGLColorDefault(&data[0], 1);
-    REQUIRE(data[0] == buildHex(0xff, 0x11, 0x03, 0x02));
-}
-
-TEST_CASE("Dye replaceAOGLColor 1 3 default", "")
-{
-    DyePalette palette("#40404040,20000000,0100ee40,102030ff", 8);
-    uint32_t data[1];
-    data[0] = buildHex(0x40, 0xee, 0x00, 0x01);
-    palette.replaceAOGLColorDefault(&data[0], 1);
-    REQUIRE(data[0] == buildHex(0xff, 0x30, 0x20, 0x10));
-}
-
-TEST_CASE("Dye replaceAOGLColor 2 1 default", "")
-{
-    DyePalette palette("#40404040,20000000,0100ee40,102030ff", 8);
-    uint32_t data[2];
-    data[0] = buildHex(0x40, 0xee, 0x00, 0x01);
-    data[1] = buildHex(0x40, 0xee, 0x00, 0x01);
-    palette.replaceAOGLColorDefault(&data[0], 2);
-    REQUIRE(data[0] == buildHex(0xff, 0x30, 0x20, 0x10));
-    REQUIRE(data[1] == buildHex(0xff, 0x30, 0x20, 0x10));
-}
-
-TEST_CASE("Dye replaceAOGLColor 4 1 default", "")
-{
-    DyePalette palette("#40404040,20000000,0100ee40,102030ff", 8);
-    uint32_t data[4];
-    data[0] = buildHex(0x40, 0xee, 0x00, 0x01);
-    data[1] = buildHex(0x40, 0xee, 0x00, 0x01);
-    data[2] = buildHex(0x41, 0xee, 0x00, 0x01);
-    data[3] = buildHex(0x40, 0xee, 0x00, 0x01);
-    palette.replaceAOGLColorDefault(&data[0], 4);
-    REQUIRE(data[0] == buildHex(0xff, 0x30, 0x20, 0x10));
-    REQUIRE(data[1] == buildHex(0xff, 0x30, 0x20, 0x10));
-    REQUIRE(data[2] == buildHex(0x41, 0xee, 0x00, 0x01));
-    REQUIRE(data[3] == buildHex(0xff, 0x30, 0x20, 0x10));
-}
-
-TEST_CASE("Dye replaceAOGLColor 8 1 default", "")
-{
-    DyePalette palette("#40404040,20000000,0100ee40,102030ff", 8);
-    uint32_t data[8];
-    data[0] = buildHex(0x40, 0xee, 0x00, 0x01);
-    data[1] = buildHex(0x40, 0xee, 0x00, 0x01);
-    data[2] = buildHex(0x41, 0xee, 0x00, 0x01);
-    data[3] = buildHex(0x40, 0xee, 0x00, 0x01);
-    data[4] = buildHex(0x40, 0xee, 0x00, 0x01);
-    data[5] = buildHex(0x40, 0x40, 0x40, 0x40);
-    data[6] = buildHex(0x41, 0xe0, 0x00, 0x01);
-    data[7] = buildHex(0x40, 0xee, 0x00, 0x01);
-    palette.replaceAOGLColorDefault(&data[0], 8);
-    REQUIRE(data[0] == buildHex(0xff, 0x30, 0x20, 0x10));
-    REQUIRE(data[1] == buildHex(0xff, 0x30, 0x20, 0x10));
-    REQUIRE(data[2] == buildHex(0x41, 0xee, 0x00, 0x01));
-    REQUIRE(data[3] == buildHex(0xff, 0x30, 0x20, 0x10));
-    REQUIRE(data[4] == buildHex(0xff, 0x30, 0x20, 0x10));
-    REQUIRE(data[5] == buildHex(0x00, 0x00, 0x00, 0x20));
-    REQUIRE(data[6] == buildHex(0x41, 0xe0, 0x00, 0x01));
-    REQUIRE(data[7] == buildHex(0xff, 0x30, 0x20, 0x10));
-}
-
-TEST_CASE("Dye replaceAOGLColor 8 1 sse2", "")
-{
-    DyePalette palette("#40404040,20000000,0100ee40,102030ff", 8);
-    uint32_t data[8];
-    data[0] = buildHex(0x40, 0xee, 0x00, 0x01);
-    data[1] = buildHex(0x40, 0xee, 0x00, 0x01);
-    data[2] = buildHex(0x41, 0xee, 0x00, 0x01);
-    data[3] = buildHex(0x40, 0xee, 0x00, 0x01);
-    data[4] = buildHex(0x40, 0xee, 0x00, 0x01);
-    data[5] = buildHex(0x40, 0x40, 0x40, 0x40);
-    data[6] = buildHex(0x41, 0xe0, 0x00, 0x01);
-    data[7] = buildHex(0x40, 0xee, 0x00, 0x01);
-    DYEPALETTE(palette, AOGLColorSse2)(&data[0], 8);
-    REQUIRE(data[0] == buildHex(0xff, 0x30, 0x20, 0x10));
-    REQUIRE(data[1] == buildHex(0xff, 0x30, 0x20, 0x10));
-    REQUIRE(data[2] == buildHex(0x41, 0xee, 0x00, 0x01));
-    REQUIRE(data[3] == buildHex(0xff, 0x30, 0x20, 0x10));
-    REQUIRE(data[4] == buildHex(0xff, 0x30, 0x20, 0x10));
-    REQUIRE(data[5] == buildHex(0x00, 0x00, 0x00, 0x20));
-    REQUIRE(data[6] == buildHex(0x41, 0xe0, 0x00, 0x01));
-    REQUIRE(data[7] == buildHex(0xff, 0x30, 0x20, 0x10));
-}
-
-TEST_CASE("Dye replaceAOGLColor 8 1 avx2", "")
-{
-    DyePalette palette("#40404040,20000000,0100ee40,102030ff", 8);
-    uint32_t data[8];
-    data[0] = buildHex(0x40, 0xee, 0x00, 0x01);
-    data[1] = buildHex(0x40, 0xee, 0x00, 0x01);
-    data[2] = buildHex(0x41, 0xee, 0x00, 0x01);
-    data[3] = buildHex(0x40, 0xee, 0x00, 0x01);
-    data[4] = buildHex(0x40, 0xee, 0x00, 0x01);
-    data[5] = buildHex(0x40, 0x40, 0x40, 0x40);
-    data[6] = buildHex(0x41, 0xe0, 0x00, 0x01);
-    data[7] = buildHex(0x40, 0xee, 0x00, 0x01);
-    DYEPALETTE(palette, AOGLColorAvx2)(&data[0], 8);
-    REQUIRE(data[0] == buildHex(0xff, 0x30, 0x20, 0x10));
-    REQUIRE(data[1] == buildHex(0xff, 0x30, 0x20, 0x10));
-    REQUIRE(data[2] == buildHex(0x41, 0xee, 0x00, 0x01));
-    REQUIRE(data[3] == buildHex(0xff, 0x30, 0x20, 0x10));
-    REQUIRE(data[4] == buildHex(0xff, 0x30, 0x20, 0x10));
-    REQUIRE(data[5] == buildHex(0x00, 0x00, 0x00, 0x20));
-    REQUIRE(data[6] == buildHex(0x41, 0xe0, 0x00, 0x01));
-    REQUIRE(data[7] == buildHex(0xff, 0x30, 0x20, 0x10));
-}
-#endif  // USE_OPENGL
-
-
-TEST_CASE("Dye replaceSColor 1 1", "")
-{
-    DyePalette palette("#00ff00,000011", 6);
-    uint32_t data[1];
-    data[0] = buildHex(0x10, 0x03, 0x02, 0x01);
-    DYEPALETTE(palette, SColor)(&data[0], 1);
-    REQUIRE(data[0] == buildHex(0x10, 0x03, 0x02, 0x01));
-}
-
-TEST_CASE("Dye replaceSColor 1 2", "")
-{
-    DyePalette palette("#403020,706050", 6);
-    uint32_t data[1];
-    data[0] = buildHex(0x40, 0x30, 0x20, 0x10);
-    DYEPALETTE(palette, SColor)(&data[0], 1);
-    REQUIRE(data[0] == buildHex(0x70, 0x60, 0x50, 0x10));
-}
-
-TEST_CASE("Dye replaceSColor 1 3", "")
-{
-    DyePalette palette("#123456,000000,ff3020,706050", 6);
-    uint32_t data[1];
-    data[0] = buildHex(0xff, 0x30, 0x20, 0x10);
-    DYEPALETTE(palette, SColor)(&data[0], 1);
-    REQUIRE(data[0] == buildHex(0x70, 0x60, 0x50, 0x10));
-}
-
-TEST_CASE("Dye replaceSColor 2 1", "")
-{
-    DyePalette palette("#123456,000000,ff3020,706050", 6);
-    uint32_t data[2];
-    data[0] = buildHex(0xff, 0x30, 0x20, 0x10);
-    data[1] = buildHex(0xff, 0x30, 0x20, 0x20);
-    DYEPALETTE(palette, SColor)(&data[0], 2);
-    REQUIRE(data[0] == buildHex(0x70, 0x60, 0x50, 0x10));
-    REQUIRE(data[1] == buildHex(0x70, 0x60, 0x50, 0x20));
-}
-
-TEST_CASE("Dye replaceSColor 3 1", "")
-{
-    DyePalette palette("#123456,000000,ff3020,706050", 6);
-    uint32_t data[3];
-    data[0] = buildHex(0xff, 0x30, 0x20, 0x10);
-    data[1] = buildHex(0xff, 0x30, 0x20, 0x20);
-    data[2] = buildHex(0xff, 0x30, 0x20, 0x30);
-    DYEPALETTE(palette, SColor)(&data[0], 3);
-    REQUIRE(data[0] == buildHex(0x70, 0x60, 0x50, 0x10));
-    REQUIRE(data[1] == buildHex(0x70, 0x60, 0x50, 0x20));
-    REQUIRE(data[2] == buildHex(0x70, 0x60, 0x50, 0x30));
-}
-
-TEST_CASE("Dye replaceSColor 4 1", "")
-{
-    DyePalette palette("#123456,000000,ff3020,706050", 6);
-    uint32_t data[4];
-    data[0] = buildHex(0xff, 0x30, 0x20, 0x10);
-    data[1] = buildHex(0xff, 0x30, 0x20, 0x20);
-    data[2] = buildHex(0xff, 0x40, 0x20, 0x10);
-    data[3] = buildHex(0xff, 0x30, 0x20, 0x20);
-    DYEPALETTE(palette, SColor)(&data[0], 4);
-    REQUIRE(data[0] == buildHex(0x70, 0x60, 0x50, 0x10));
-    REQUIRE(data[1] == buildHex(0x70, 0x60, 0x50, 0x20));
-    REQUIRE(data[2] == buildHex(0xff, 0x40, 0x20, 0x10));
-    REQUIRE(data[3] == buildHex(0x70, 0x60, 0x50, 0x20));
-}
-
-TEST_CASE("Dye replaceSColor 5 1", "")
-{
-    DyePalette palette("#123456,000000,ff3020,706050", 6);
-    uint32_t data[5];
-    data[0] = buildHex(0xff, 0x30, 0x20, 0x10);
-    data[1] = buildHex(0xff, 0x30, 0x20, 0x20);
-    data[2] = buildHex(0xff, 0x40, 0x20, 0x10);
-    data[3] = buildHex(0xff, 0x30, 0x20, 0x30);
-    data[4] = buildHex(0xff, 0x30, 0x20, 0x20);
-    DYEPALETTE(palette, SColor)(&data[0], 5);
-    REQUIRE(data[0] == buildHex(0x70, 0x60, 0x50, 0x10));
-    REQUIRE(data[1] == buildHex(0x70, 0x60, 0x50, 0x20));
-    REQUIRE(data[2] == buildHex(0xff, 0x40, 0x20, 0x10));
-    REQUIRE(data[3] == buildHex(0x70, 0x60, 0x50, 0x30));
-    REQUIRE(data[4] == buildHex(0x70, 0x60, 0x50, 0x20));
-}
-
-TEST_CASE("Dye replaceSColor 7 1", "")
-{
-    DyePalette palette("#123456,000000,ff3020,706050", 6);
-    uint32_t data[7];
-    data[0] = buildHex(0xff, 0x30, 0x20, 0x10);
-    data[1] = buildHex(0xff, 0x30, 0x20, 0x20);
-    data[2] = buildHex(0xff, 0x40, 0x20, 0x10);
-    data[3] = buildHex(0xff, 0x30, 0x20, 0x20);
-    data[4] = buildHex(0xff, 0x30, 0x20, 0x10);
-    data[5] = buildHex(0xff, 0x30, 0x20, 0x40);
-    data[6] = buildHex(0xff, 0x40, 0x20, 0x50);
-    DYEPALETTE(palette, SColor)(&data[0], 7);
-    REQUIRE(data[0] == buildHex(0x70, 0x60, 0x50, 0x10));
-    REQUIRE(data[1] == buildHex(0x70, 0x60, 0x50, 0x20));
-    REQUIRE(data[2] == buildHex(0xff, 0x40, 0x20, 0x10));
-    REQUIRE(data[3] == buildHex(0x70, 0x60, 0x50, 0x20));
-    REQUIRE(data[4] == buildHex(0x70, 0x60, 0x50, 0x10));
-    REQUIRE(data[5] == buildHex(0x70, 0x60, 0x50, 0x40));
-    REQUIRE(data[6] == buildHex(0xff, 0x40, 0x20, 0x50));
-}
-
-TEST_CASE("Dye replaceSColor 8 1", "")
-{
-    DyePalette palette("#123456,000000,ff3020,706050", 6);
-    uint32_t data[8];
-    data[0] = buildHex(0xff, 0x30, 0x20, 0x10);
-    data[1] = buildHex(0xff, 0x30, 0x20, 0x20);
-    data[2] = buildHex(0xff, 0x40, 0x20, 0x10);
-    data[3] = buildHex(0xff, 0x30, 0x20, 0x20);
-    data[4] = buildHex(0xff, 0x30, 0x20, 0x10);
-    data[5] = buildHex(0xff, 0x30, 0x20, 0x40);
-    data[6] = buildHex(0xff, 0x40, 0x20, 0x50);
-    data[7] = buildHex(0xff, 0x30, 0x20, 0x60);
-    DYEPALETTE(palette, SColor)(&data[0], 8);
-    REQUIRE(data[0] == buildHex(0x70, 0x60, 0x50, 0x10));
-    REQUIRE(data[1] == buildHex(0x70, 0x60, 0x50, 0x20));
-    REQUIRE(data[2] == buildHex(0xff, 0x40, 0x20, 0x10));
-    REQUIRE(data[3] == buildHex(0x70, 0x60, 0x50, 0x20));
-    REQUIRE(data[4] == buildHex(0x70, 0x60, 0x50, 0x10));
-    REQUIRE(data[5] == buildHex(0x70, 0x60, 0x50, 0x40));
-    REQUIRE(data[6] == buildHex(0xff, 0x40, 0x20, 0x50));
-    REQUIRE(data[7] == buildHex(0x70, 0x60, 0x50, 0x60));
-}
-
-TEST_CASE("Dye replaceSColor 9 1", "")
-{
-    DyePalette palette("#123456,000000,ff3020,706050", 6);
-    uint32_t data[9];
-    data[0] = buildHex(0xff, 0x30, 0x20, 0x10);
-    data[1] = buildHex(0xff, 0x30, 0x20, 0x20);
-    data[2] = buildHex(0xff, 0x40, 0x20, 0x10);
-    data[3] = buildHex(0xff, 0x30, 0x20, 0x20);
-    data[4] = buildHex(0xff, 0x30, 0x20, 0x10);
-    data[5] = buildHex(0xff, 0x30, 0x20, 0x40);
-    data[6] = buildHex(0xff, 0x40, 0x20, 0x50);
-    data[7] = buildHex(0xff, 0x30, 0x20, 0x60);
-    data[8] = buildHex(0xff, 0x30, 0x20, 0x70);
-    DYEPALETTE(palette, SColor)(&data[0], 9);
-    REQUIRE(data[0] == buildHex(0x70, 0x60, 0x50, 0x10));
-    REQUIRE(data[1] == buildHex(0x70, 0x60, 0x50, 0x20));
-    REQUIRE(data[2] == buildHex(0xff, 0x40, 0x20, 0x10));
-    REQUIRE(data[3] == buildHex(0x70, 0x60, 0x50, 0x20));
-    REQUIRE(data[4] == buildHex(0x70, 0x60, 0x50, 0x10));
-    REQUIRE(data[5] == buildHex(0x70, 0x60, 0x50, 0x40));
-    REQUIRE(data[6] == buildHex(0xff, 0x40, 0x20, 0x50));
-    REQUIRE(data[7] == buildHex(0x70, 0x60, 0x50, 0x60));
-    REQUIRE(data[8] == buildHex(0x70, 0x60, 0x50, 0x70));
-}
-
-TEST_CASE("Dye replaceSColor 10 1", "")
-{
-    DyePalette palette("#123456,000000,ff3020,706050", 6);
-    uint32_t data[10];
-    data[0] = buildHex(0xff, 0x30, 0x20, 0x10);
-    data[1] = buildHex(0xff, 0x30, 0x20, 0x20);
-    data[2] = buildHex(0xff, 0x40, 0x20, 0x10);
-    data[3] = buildHex(0xff, 0x30, 0x20, 0x20);
-    data[4] = buildHex(0xff, 0x30, 0x20, 0x10);
-    data[5] = buildHex(0xff, 0x30, 0x20, 0x40);
-    data[6] = buildHex(0xff, 0x40, 0x20, 0x50);
-    data[7] = buildHex(0xff, 0x30, 0x20, 0x60);
-    data[8] = buildHex(0x12, 0x34, 0x56, 0x70);
-    data[9] = buildHex(0xff, 0x30, 0x20, 0x80);
-    DYEPALETTE(palette, SColor)(&data[0], 10);
-    REQUIRE(data[0] == buildHex(0x70, 0x60, 0x50, 0x10));
-    REQUIRE(data[1] == buildHex(0x70, 0x60, 0x50, 0x20));
-    REQUIRE(data[2] == buildHex(0xff, 0x40, 0x20, 0x10));
-    REQUIRE(data[3] == buildHex(0x70, 0x60, 0x50, 0x20));
-    REQUIRE(data[4] == buildHex(0x70, 0x60, 0x50, 0x10));
-    REQUIRE(data[5] == buildHex(0x70, 0x60, 0x50, 0x40));
-    REQUIRE(data[6] == buildHex(0xff, 0x40, 0x20, 0x50));
-    REQUIRE(data[7] == buildHex(0x70, 0x60, 0x50, 0x60));
-    REQUIRE(data[8] == buildHex(0x00, 0x00, 0x00, 0x70));
-    REQUIRE(data[9] == buildHex(0x70, 0x60, 0x50, 0x80));
-}
-
-TEST_CASE("Dye replaceSColor 1 1 default", "")
-{
-    DyePalette palette("#00ff00,000011", 6);
-    uint32_t data[1];
-    data[0] = buildHex(0x10, 0x03, 0x02, 0x01);
-    palette.replaceSColorDefault(&data[0], 1);
-    REQUIRE(data[0] == buildHex(0x10, 0x03, 0x02, 0x01));
-}
-
-TEST_CASE("Dye replaceSColor 1 2 default", "")
-{
-    DyePalette palette("#403020,706050", 6);
-    uint32_t data[1];
-    data[0] = buildHex(0x40, 0x30, 0x20, 0x10);
-    palette.replaceSColorDefault(&data[0], 1);
-    REQUIRE(data[0] == buildHex(0x70, 0x60, 0x50, 0x10));
-}
-
-TEST_CASE("Dye replaceSColor 1 3 default", "")
-{
-    DyePalette palette("#123456,000000,ff3020,706050", 6);
-    uint32_t data[1];
-    data[0] = buildHex(0xff, 0x30, 0x20, 0x10);
-    palette.replaceSColorDefault(&data[0], 1);
-    REQUIRE(data[0] == buildHex(0x70, 0x60, 0x50, 0x10));
-}
-
-TEST_CASE("Dye replaceSColor 2 1 default", "")
-{
-    DyePalette palette("#123456,000000,ff3020,706050", 6);
-    uint32_t data[2];
-    data[0] = buildHex(0xff, 0x30, 0x20, 0x10);
-    data[1] = buildHex(0xff, 0x30, 0x20, 0x20);
-    palette.replaceSColorDefault(&data[0], 2);
-    REQUIRE(data[0] == buildHex(0x70, 0x60, 0x50, 0x10));
-    REQUIRE(data[1] == buildHex(0x70, 0x60, 0x50, 0x20));
-}
-
-TEST_CASE("Dye replaceSColor 3 1 default", "")
-{
-    DyePalette palette("#123456,000000,ff3020,706050", 6);
-    uint32_t data[3];
-    data[0] = buildHex(0xff, 0x30, 0x20, 0x10);
-    data[1] = buildHex(0xff, 0x30, 0x20, 0x20);
-    data[2] = buildHex(0xff, 0x30, 0x20, 0x30);
-    palette.replaceSColorDefault(&data[0], 3);
-    REQUIRE(data[0] == buildHex(0x70, 0x60, 0x50, 0x10));
-    REQUIRE(data[1] == buildHex(0x70, 0x60, 0x50, 0x20));
-    REQUIRE(data[2] == buildHex(0x70, 0x60, 0x50, 0x30));
-}
-
-TEST_CASE("Dye replaceSColor 4 1 default", "")
-{
-    DyePalette palette("#123456,000000,ff3020,706050", 6);
-    uint32_t data[4];
-    data[0] = buildHex(0xff, 0x30, 0x20, 0x10);
-    data[1] = buildHex(0xff, 0x30, 0x20, 0x20);
-    data[2] = buildHex(0xff, 0x40, 0x20, 0x10);
-    data[3] = buildHex(0xff, 0x30, 0x20, 0x20);
-    palette.replaceSColorDefault(&data[0], 4);
-    REQUIRE(data[0] == buildHex(0x70, 0x60, 0x50, 0x10));
-    REQUIRE(data[1] == buildHex(0x70, 0x60, 0x50, 0x20));
-    REQUIRE(data[2] == buildHex(0xff, 0x40, 0x20, 0x10));
-    REQUIRE(data[3] == buildHex(0x70, 0x60, 0x50, 0x20));
-}
-
-TEST_CASE("Dye replaceSColor 5 1 default", "")
-{
-    DyePalette palette("#123456,000000,ff3020,706050", 6);
-    uint32_t data[5];
-    data[0] = buildHex(0xff, 0x30, 0x20, 0x10);
-    data[1] = buildHex(0xff, 0x30, 0x20, 0x20);
-    data[2] = buildHex(0xff, 0x40, 0x20, 0x10);
-    data[3] = buildHex(0xff, 0x30, 0x20, 0x30);
-    data[4] = buildHex(0xff, 0x30, 0x20, 0x20);
-    palette.replaceSColorDefault(&data[0], 5);
-    REQUIRE(data[0] == buildHex(0x70, 0x60, 0x50, 0x10));
-    REQUIRE(data[1] == buildHex(0x70, 0x60, 0x50, 0x20));
-    REQUIRE(data[2] == buildHex(0xff, 0x40, 0x20, 0x10));
-    REQUIRE(data[3] == buildHex(0x70, 0x60, 0x50, 0x30));
-    REQUIRE(data[4] == buildHex(0x70, 0x60, 0x50, 0x20));
-}
-
-TEST_CASE("Dye replaceSColor 7 1 default", "")
-{
-    DyePalette palette("#123456,000000,ff3020,706050", 6);
-    uint32_t data[7];
-    data[0] = buildHex(0xff, 0x30, 0x20, 0x10);
-    data[1] = buildHex(0xff, 0x30, 0x20, 0x20);
-    data[2] = buildHex(0xff, 0x40, 0x20, 0x10);
-    data[3] = buildHex(0xff, 0x30, 0x20, 0x20);
-    data[4] = buildHex(0xff, 0x30, 0x20, 0x10);
-    data[5] = buildHex(0xff, 0x30, 0x20, 0x40);
-    data[6] = buildHex(0xff, 0x40, 0x20, 0x50);
-    palette.replaceSColorDefault(&data[0], 7);
-    REQUIRE(data[0] == buildHex(0x70, 0x60, 0x50, 0x10));
-    REQUIRE(data[1] == buildHex(0x70, 0x60, 0x50, 0x20));
-    REQUIRE(data[2] == buildHex(0xff, 0x40, 0x20, 0x10));
-    REQUIRE(data[3] == buildHex(0x70, 0x60, 0x50, 0x20));
-    REQUIRE(data[4] == buildHex(0x70, 0x60, 0x50, 0x10));
-    REQUIRE(data[5] == buildHex(0x70, 0x60, 0x50, 0x40));
-    REQUIRE(data[6] == buildHex(0xff, 0x40, 0x20, 0x50));
-}
-
-TEST_CASE("Dye replaceSColor 8 1 default", "")
-{
-    DyePalette palette("#123456,000000,ff3020,706050", 6);
-    uint32_t data[8];
-    data[0] = buildHex(0xff, 0x30, 0x20, 0x10);
-    data[1] = buildHex(0xff, 0x30, 0x20, 0x20);
-    data[2] = buildHex(0xff, 0x40, 0x20, 0x10);
-    data[3] = buildHex(0xff, 0x30, 0x20, 0x20);
-    data[4] = buildHex(0xff, 0x30, 0x20, 0x10);
-    data[5] = buildHex(0xff, 0x30, 0x20, 0x40);
-    data[6] = buildHex(0xff, 0x40, 0x20, 0x50);
-    data[7] = buildHex(0xff, 0x30, 0x20, 0x60);
-    palette.replaceSColorDefault(&data[0], 8);
-    REQUIRE(data[0] == buildHex(0x70, 0x60, 0x50, 0x10));
-    REQUIRE(data[1] == buildHex(0x70, 0x60, 0x50, 0x20));
-    REQUIRE(data[2] == buildHex(0xff, 0x40, 0x20, 0x10));
-    REQUIRE(data[3] == buildHex(0x70, 0x60, 0x50, 0x20));
-    REQUIRE(data[4] == buildHex(0x70, 0x60, 0x50, 0x10));
-    REQUIRE(data[5] == buildHex(0x70, 0x60, 0x50, 0x40));
-    REQUIRE(data[6] == buildHex(0xff, 0x40, 0x20, 0x50));
-    REQUIRE(data[7] == buildHex(0x70, 0x60, 0x50, 0x60));
-}
-
-TEST_CASE("Dye replaceSColor 9 1 default", "")
-{
-    DyePalette palette("#123456,000000,ff3020,706050", 6);
-    uint32_t data[9];
-    data[0] = buildHex(0xff, 0x30, 0x20, 0x10);
-    data[1] = buildHex(0xff, 0x30, 0x20, 0x20);
-    data[2] = buildHex(0xff, 0x40, 0x20, 0x10);
-    data[3] = buildHex(0xff, 0x30, 0x20, 0x20);
-    data[4] = buildHex(0xff, 0x30, 0x20, 0x10);
-    data[5] = buildHex(0xff, 0x30, 0x20, 0x40);
-    data[6] = buildHex(0xff, 0x40, 0x20, 0x50);
-    data[7] = buildHex(0xff, 0x30, 0x20, 0x60);
-    data[8] = buildHex(0xff, 0x30, 0x20, 0x70);
-    palette.replaceSColorDefault(&data[0], 9);
-    REQUIRE(data[0] == buildHex(0x70, 0x60, 0x50, 0x10));
-    REQUIRE(data[1] == buildHex(0x70, 0x60, 0x50, 0x20));
-    REQUIRE(data[2] == buildHex(0xff, 0x40, 0x20, 0x10));
-    REQUIRE(data[3] == buildHex(0x70, 0x60, 0x50, 0x20));
-    REQUIRE(data[4] == buildHex(0x70, 0x60, 0x50, 0x10));
-    REQUIRE(data[5] == buildHex(0x70, 0x60, 0x50, 0x40));
-    REQUIRE(data[6] == buildHex(0xff, 0x40, 0x20, 0x50));
-    REQUIRE(data[7] == buildHex(0x70, 0x60, 0x50, 0x60));
-    REQUIRE(data[8] == buildHex(0x70, 0x60, 0x50, 0x70));
-}
-
-TEST_CASE("Dye replaceSColor 10 1 default", "")
-{
-    DyePalette palette("#123456,000000,ff3020,706050", 6);
-    uint32_t data[10];
-    data[0] = buildHex(0xff, 0x30, 0x20, 0x10);
-    data[1] = buildHex(0xff, 0x30, 0x20, 0x20);
-    data[2] = buildHex(0xff, 0x40, 0x20, 0x10);
-    data[3] = buildHex(0xff, 0x30, 0x20, 0x20);
-    data[4] = buildHex(0xff, 0x30, 0x20, 0x10);
-    data[5] = buildHex(0xff, 0x30, 0x20, 0x40);
-    data[6] = buildHex(0xff, 0x40, 0x20, 0x50);
-    data[7] = buildHex(0xff, 0x30, 0x20, 0x60);
-    data[8] = buildHex(0x12, 0x34, 0x56, 0x70);
-    data[9] = buildHex(0xff, 0x30, 0x20, 0x80);
-    palette.replaceSColorDefault(&data[0], 10);
-    REQUIRE(data[0] == buildHex(0x70, 0x60, 0x50, 0x10));
-    REQUIRE(data[1] == buildHex(0x70, 0x60, 0x50, 0x20));
-    REQUIRE(data[2] == buildHex(0xff, 0x40, 0x20, 0x10));
-    REQUIRE(data[3] == buildHex(0x70, 0x60, 0x50, 0x20));
-    REQUIRE(data[4] == buildHex(0x70, 0x60, 0x50, 0x10));
-    REQUIRE(data[5] == buildHex(0x70, 0x60, 0x50, 0x40));
-    REQUIRE(data[6] == buildHex(0xff, 0x40, 0x20, 0x50));
-    REQUIRE(data[7] == buildHex(0x70, 0x60, 0x50, 0x60));
-    REQUIRE(data[8] == buildHex(0x00, 0x00, 0x00, 0x70));
-    REQUIRE(data[9] == buildHex(0x70, 0x60, 0x50, 0x80));
-}
-
-TEST_CASE("Dye replaceSColor 1 1 sse2", "")
-{
-    DyePalette palette("#00ff00,000011", 6);
-    uint32_t data[1];
-    data[0] = buildHex(0x10, 0x03, 0x02, 0x01);
-    DYEPALETTE(palette, SColorSse2)(&data[0], 1);
-    REQUIRE(data[0] == buildHex(0x10, 0x03, 0x02, 0x01));
-}
-
-TEST_CASE("Dye replaceSColor 1 2 sse2", "")
-{
-    DyePalette palette("#403020,706050", 6);
-    uint32_t data[1];
-    data[0] = buildHex(0x40, 0x30, 0x20, 0x10);
-    DYEPALETTE(palette, SColorSse2)(&data[0], 1);
-    REQUIRE(data[0] == buildHex(0x70, 0x60, 0x50, 0x10));
-}
-
-TEST_CASE("Dye replaceSColor 1 3 sse2", "")
-{
-    DyePalette palette("#123456,000000,ff3020,706050", 6);
-    uint32_t data[1];
-    data[0] = buildHex(0xff, 0x30, 0x20, 0x10);
-    DYEPALETTE(palette, SColorSse2)(&data[0], 1);
-    REQUIRE(data[0] == buildHex(0x70, 0x60, 0x50, 0x10));
-}
-
-TEST_CASE("Dye replaceSColor 2 1 sse2", "")
-{
-    DyePalette palette("#123456,000000,ff3020,706050", 6);
-    uint32_t data[2];
-    data[0] = buildHex(0xff, 0x30, 0x20, 0x10);
-    data[1] = buildHex(0xff, 0x30, 0x20, 0x20);
-    DYEPALETTE(palette, SColorSse2)(&data[0], 2);
-    REQUIRE(data[0] == buildHex(0x70, 0x60, 0x50, 0x10));
-    REQUIRE(data[1] == buildHex(0x70, 0x60, 0x50, 0x20));
-}
-
-TEST_CASE("Dye replaceSColor 3 1 sse2", "")
-{
-    DyePalette palette("#123456,000000,ff3020,706050", 6);
-    uint32_t data[3];
-    data[0] = buildHex(0xff, 0x30, 0x20, 0x10);
-    data[1] = buildHex(0xff, 0x30, 0x20, 0x20);
-    data[2] = buildHex(0xff, 0x30, 0x20, 0x30);
-    DYEPALETTE(palette, SColorSse2)(&data[0], 3);
-    REQUIRE(data[0] == buildHex(0x70, 0x60, 0x50, 0x10));
-    REQUIRE(data[1] == buildHex(0x70, 0x60, 0x50, 0x20));
-    REQUIRE(data[2] == buildHex(0x70, 0x60, 0x50, 0x30));
-}
-
-TEST_CASE("Dye replaceSColor 4 1 sse2", "")
-{
-    DyePalette palette("#123456,000000,ff3020,706050", 6);
-    uint32_t data[4];
-    data[0] = buildHex(0xff, 0x30, 0x20, 0x10);
-    data[1] = buildHex(0xff, 0x30, 0x20, 0x20);
-    data[2] = buildHex(0xff, 0x40, 0x20, 0x10);
-    data[3] = buildHex(0xff, 0x30, 0x20, 0x20);
-    DYEPALETTE(palette, SColorSse2)(&data[0], 4);
-    REQUIRE(data[0] == buildHex(0x70, 0x60, 0x50, 0x10));
-    REQUIRE(data[1] == buildHex(0x70, 0x60, 0x50, 0x20));
-    REQUIRE(data[2] == buildHex(0xff, 0x40, 0x20, 0x10));
-    REQUIRE(data[3] == buildHex(0x70, 0x60, 0x50, 0x20));
-}
-
-TEST_CASE("Dye replaceSColor 5 1 sse2", "")
-{
-    DyePalette palette("#123456,000000,ff3020,706050", 6);
-    uint32_t data[5];
-    data[0] = buildHex(0xff, 0x30, 0x20, 0x10);
-    data[1] = buildHex(0xff, 0x30, 0x20, 0x20);
-    data[2] = buildHex(0xff, 0x40, 0x20, 0x10);
-    data[3] = buildHex(0xff, 0x30, 0x20, 0x30);
-    data[4] = buildHex(0xff, 0x30, 0x20, 0x20);
-    DYEPALETTE(palette, SColorSse2)(&data[0], 5);
-    REQUIRE(data[0] == buildHex(0x70, 0x60, 0x50, 0x10));
-    REQUIRE(data[1] == buildHex(0x70, 0x60, 0x50, 0x20));
-    REQUIRE(data[2] == buildHex(0xff, 0x40, 0x20, 0x10));
-    REQUIRE(data[3] == buildHex(0x70, 0x60, 0x50, 0x30));
-    REQUIRE(data[4] == buildHex(0x70, 0x60, 0x50, 0x20));
-}
-
-TEST_CASE("Dye replaceSColor 7 1 sse2", "")
-{
-    DyePalette palette("#123456,000000,ff3020,706050", 6);
-    uint32_t data[7];
-    data[0] = buildHex(0xff, 0x30, 0x20, 0x10);
-    data[1] = buildHex(0xff, 0x30, 0x20, 0x20);
-    data[2] = buildHex(0xff, 0x40, 0x20, 0x10);
-    data[3] = buildHex(0xff, 0x30, 0x20, 0x20);
-    data[4] = buildHex(0xff, 0x30, 0x20, 0x10);
-    data[5] = buildHex(0xff, 0x30, 0x20, 0x40);
-    data[6] = buildHex(0xff, 0x40, 0x20, 0x50);
-    DYEPALETTE(palette, SColorSse2)(&data[0], 7);
-    REQUIRE(data[0] == buildHex(0x70, 0x60, 0x50, 0x10));
-    REQUIRE(data[1] == buildHex(0x70, 0x60, 0x50, 0x20));
-    REQUIRE(data[2] == buildHex(0xff, 0x40, 0x20, 0x10));
-    REQUIRE(data[3] == buildHex(0x70, 0x60, 0x50, 0x20));
-    REQUIRE(data[4] == buildHex(0x70, 0x60, 0x50, 0x10));
-    REQUIRE(data[5] == buildHex(0x70, 0x60, 0x50, 0x40));
-    REQUIRE(data[6] == buildHex(0xff, 0x40, 0x20, 0x50));
-}
-
-TEST_CASE("Dye replaceSColor 8 1 sse2", "")
-{
-    DyePalette palette("#123456,000000,ff3020,706050", 6);
-    uint32_t data[8];
-    data[0] = buildHex(0xff, 0x30, 0x20, 0x10);
-    data[1] = buildHex(0xff, 0x30, 0x20, 0x20);
-    data[2] = buildHex(0xff, 0x40, 0x20, 0x10);
-    data[3] = buildHex(0xff, 0x30, 0x20, 0x20);
-    data[4] = buildHex(0xff, 0x30, 0x20, 0x10);
-    data[5] = buildHex(0xff, 0x30, 0x20, 0x40);
-    data[6] = buildHex(0xff, 0x40, 0x20, 0x50);
-    data[7] = buildHex(0xff, 0x30, 0x20, 0x60);
-    DYEPALETTE(palette, SColorSse2)(&data[0], 8);
-    REQUIRE(data[0] == buildHex(0x70, 0x60, 0x50, 0x10));
-    REQUIRE(data[1] == buildHex(0x70, 0x60, 0x50, 0x20));
-    REQUIRE(data[2] == buildHex(0xff, 0x40, 0x20, 0x10));
-    REQUIRE(data[3] == buildHex(0x70, 0x60, 0x50, 0x20));
-    REQUIRE(data[4] == buildHex(0x70, 0x60, 0x50, 0x10));
-    REQUIRE(data[5] == buildHex(0x70, 0x60, 0x50, 0x40));
-    REQUIRE(data[6] == buildHex(0xff, 0x40, 0x20, 0x50));
-    REQUIRE(data[7] == buildHex(0x70, 0x60, 0x50, 0x60));
-}
-
-TEST_CASE("Dye replaceSColor 9 1 sse2", "")
-{
-    DyePalette palette("#123456,000000,ff3020,706050", 6);
-    uint32_t data[9];
-    data[0] = buildHex(0xff, 0x30, 0x20, 0x10);
-    data[1] = buildHex(0xff, 0x30, 0x20, 0x20);
-    data[2] = buildHex(0xff, 0x40, 0x20, 0x10);
-    data[3] = buildHex(0xff, 0x30, 0x20, 0x20);
-    data[4] = buildHex(0xff, 0x30, 0x20, 0x10);
-    data[5] = buildHex(0xff, 0x30, 0x20, 0x40);
-    data[6] = buildHex(0xff, 0x40, 0x20, 0x50);
-    data[7] = buildHex(0xff, 0x30, 0x20, 0x60);
-    data[8] = buildHex(0xff, 0x30, 0x20, 0x70);
-    DYEPALETTE(palette, SColorSse2)(&data[0], 9);
-    REQUIRE(data[0] == buildHex(0x70, 0x60, 0x50, 0x10));
-    REQUIRE(data[1] == buildHex(0x70, 0x60, 0x50, 0x20));
-    REQUIRE(data[2] == buildHex(0xff, 0x40, 0x20, 0x10));
-    REQUIRE(data[3] == buildHex(0x70, 0x60, 0x50, 0x20));
-    REQUIRE(data[4] == buildHex(0x70, 0x60, 0x50, 0x10));
-    REQUIRE(data[5] == buildHex(0x70, 0x60, 0x50, 0x40));
-    REQUIRE(data[6] == buildHex(0xff, 0x40, 0x20, 0x50));
-    REQUIRE(data[7] == buildHex(0x70, 0x60, 0x50, 0x60));
-    REQUIRE(data[8] == buildHex(0x70, 0x60, 0x50, 0x70));
-}
-
-TEST_CASE("Dye replaceSColor 10 1 sse2", "")
-{
-    DyePalette palette("#123456,000000,ff3020,706050", 6);
-    uint32_t data[10];
-    data[0] = buildHex(0xff, 0x30, 0x20, 0x10);
-    data[1] = buildHex(0xff, 0x30, 0x20, 0x20);
-    data[2] = buildHex(0xff, 0x40, 0x20, 0x10);
-    data[3] = buildHex(0xff, 0x30, 0x20, 0x20);
-    data[4] = buildHex(0xff, 0x30, 0x20, 0x10);
-    data[5] = buildHex(0xff, 0x30, 0x20, 0x40);
-    data[6] = buildHex(0xff, 0x40, 0x20, 0x50);
-    data[7] = buildHex(0xff, 0x30, 0x20, 0x60);
-    data[8] = buildHex(0x12, 0x34, 0x56, 0x70);
-    data[9] = buildHex(0xff, 0x30, 0x20, 0x80);
-    DYEPALETTE(palette, SColorSse2)(&data[0], 10);
-    REQUIRE(data[0] == buildHex(0x70, 0x60, 0x50, 0x10));
-    REQUIRE(data[1] == buildHex(0x70, 0x60, 0x50, 0x20));
-    REQUIRE(data[2] == buildHex(0xff, 0x40, 0x20, 0x10));
-    REQUIRE(data[3] == buildHex(0x70, 0x60, 0x50, 0x20));
-    REQUIRE(data[4] == buildHex(0x70, 0x60, 0x50, 0x10));
-    REQUIRE(data[5] == buildHex(0x70, 0x60, 0x50, 0x40));
-    REQUIRE(data[6] == buildHex(0xff, 0x40, 0x20, 0x50));
-    REQUIRE(data[7] == buildHex(0x70, 0x60, 0x50, 0x60));
-    REQUIRE(data[8] == buildHex(0x00, 0x00, 0x00, 0x70));
-    REQUIRE(data[9] == buildHex(0x70, 0x60, 0x50, 0x80));
-}
-
-TEST_CASE("Dye replaceSColor 1 1 avx2", "")
-{
-    DyePalette palette("#00ff00,000011", 6);
-    uint32_t data[1];
-    data[0] = buildHex(0x10, 0x03, 0x02, 0x01);
-    DYEPALETTE(palette, SColorAvx2)(&data[0], 1);
-    REQUIRE(data[0] == buildHex(0x10, 0x03, 0x02, 0x01));
-}
-
-TEST_CASE("Dye replaceSColor 1 2 avx2", "")
-{
-    DyePalette palette("#403020,706050", 6);
-    uint32_t data[1];
-    data[0] = buildHex(0x40, 0x30, 0x20, 0x10);
-    DYEPALETTE(palette, SColorAvx2)(&data[0], 1);
-    REQUIRE(data[0] == buildHex(0x70, 0x60, 0x50, 0x10));
-}
-
-TEST_CASE("Dye replaceSColor 1 3 avx2", "")
-{
-    DyePalette palette("#123456,000000,ff3020,706050", 6);
-    uint32_t data[1];
-    data[0] = buildHex(0xff, 0x30, 0x20, 0x10);
-    DYEPALETTE(palette, SColorAvx2)(&data[0], 1);
-    REQUIRE(data[0] == buildHex(0x70, 0x60, 0x50, 0x10));
-}
-
-TEST_CASE("Dye replaceSColor 2 1 avx2", "")
-{
-    DyePalette palette("#123456,000000,ff3020,706050", 6);
-    uint32_t data[2];
-    data[0] = buildHex(0xff, 0x30, 0x20, 0x10);
-    data[1] = buildHex(0xff, 0x30, 0x20, 0x20);
-    DYEPALETTE(palette, SColorAvx2)(&data[0], 2);
-    REQUIRE(data[0] == buildHex(0x70, 0x60, 0x50, 0x10));
-    REQUIRE(data[1] == buildHex(0x70, 0x60, 0x50, 0x20));
-}
-
-TEST_CASE("Dye replaceSColor 3 1 avx2", "")
-{
-    DyePalette palette("#123456,000000,ff3020,706050", 6);
-    uint32_t data[3];
-    data[0] = buildHex(0xff, 0x30, 0x20, 0x10);
-    data[1] = buildHex(0xff, 0x30, 0x20, 0x20);
-    data[2] = buildHex(0xff, 0x30, 0x20, 0x30);
-    DYEPALETTE(palette, SColorAvx2)(&data[0], 3);
-    REQUIRE(data[0] == buildHex(0x70, 0x60, 0x50, 0x10));
-    REQUIRE(data[1] == buildHex(0x70, 0x60, 0x50, 0x20));
-    REQUIRE(data[2] == buildHex(0x70, 0x60, 0x50, 0x30));
-}
-
-TEST_CASE("Dye replaceSColor 4 1 avx2", "")
-{
-    DyePalette palette("#123456,000000,ff3020,706050", 6);
-    uint32_t data[4];
-    data[0] = buildHex(0xff, 0x30, 0x20, 0x10);
-    data[1] = buildHex(0xff, 0x30, 0x20, 0x20);
-    data[2] = buildHex(0xff, 0x40, 0x20, 0x10);
-    data[3] = buildHex(0xff, 0x30, 0x20, 0x20);
-    DYEPALETTE(palette, SColorAvx2)(&data[0], 4);
-    REQUIRE(data[0] == buildHex(0x70, 0x60, 0x50, 0x10));
-    REQUIRE(data[1] == buildHex(0x70, 0x60, 0x50, 0x20));
-    REQUIRE(data[2] == buildHex(0xff, 0x40, 0x20, 0x10));
-    REQUIRE(data[3] == buildHex(0x70, 0x60, 0x50, 0x20));
-}
-
-TEST_CASE("Dye replaceSColor 5 1 avx2", "")
-{
-    DyePalette palette("#123456,000000,ff3020,706050", 6);
-    uint32_t data[5];
-    data[0] = buildHex(0xff, 0x30, 0x20, 0x10);
-    data[1] = buildHex(0xff, 0x30, 0x20, 0x20);
-    data[2] = buildHex(0xff, 0x40, 0x20, 0x10);
-    data[3] = buildHex(0xff, 0x30, 0x20, 0x30);
-    data[4] = buildHex(0xff, 0x30, 0x20, 0x20);
-    DYEPALETTE(palette, SColorAvx2)(&data[0], 5);
-    REQUIRE(data[0] == buildHex(0x70, 0x60, 0x50, 0x10));
-    REQUIRE(data[1] == buildHex(0x70, 0x60, 0x50, 0x20));
-    REQUIRE(data[2] == buildHex(0xff, 0x40, 0x20, 0x10));
-    REQUIRE(data[3] == buildHex(0x70, 0x60, 0x50, 0x30));
-    REQUIRE(data[4] == buildHex(0x70, 0x60, 0x50, 0x20));
-}
-
-TEST_CASE("Dye replaceSColor 7 1 avx2", "")
-{
-    DyePalette palette("#123456,000000,ff3020,706050", 6);
-    uint32_t data[7];
-    data[0] = buildHex(0xff, 0x30, 0x20, 0x10);
-    data[1] = buildHex(0xff, 0x30, 0x20, 0x20);
-    data[2] = buildHex(0xff, 0x40, 0x20, 0x10);
-    data[3] = buildHex(0xff, 0x30, 0x20, 0x20);
-    data[4] = buildHex(0xff, 0x30, 0x20, 0x10);
-    data[5] = buildHex(0xff, 0x30, 0x20, 0x40);
-    data[6] = buildHex(0xff, 0x40, 0x20, 0x50);
-    DYEPALETTE(palette, SColorAvx2)(&data[0], 7);
-    REQUIRE(data[0] == buildHex(0x70, 0x60, 0x50, 0x10));
-    REQUIRE(data[1] == buildHex(0x70, 0x60, 0x50, 0x20));
-    REQUIRE(data[2] == buildHex(0xff, 0x40, 0x20, 0x10));
-    REQUIRE(data[3] == buildHex(0x70, 0x60, 0x50, 0x20));
-    REQUIRE(data[4] == buildHex(0x70, 0x60, 0x50, 0x10));
-    REQUIRE(data[5] == buildHex(0x70, 0x60, 0x50, 0x40));
-    REQUIRE(data[6] == buildHex(0xff, 0x40, 0x20, 0x50));
-}
-
-TEST_CASE("Dye replaceSColor 8 1 avx2", "")
-{
-    DyePalette palette("#123456,000000,ff3020,706050", 6);
-    uint32_t data[8];
-    data[0] = buildHex(0xff, 0x30, 0x20, 0x10);
-    data[1] = buildHex(0xff, 0x30, 0x20, 0x20);
-    data[2] = buildHex(0xff, 0x40, 0x20, 0x10);
-    data[3] = buildHex(0xff, 0x30, 0x20, 0x20);
-    data[4] = buildHex(0xff, 0x30, 0x20, 0x10);
-    data[5] = buildHex(0xff, 0x30, 0x20, 0x40);
-    data[6] = buildHex(0xff, 0x40, 0x20, 0x50);
-    data[7] = buildHex(0xff, 0x30, 0x20, 0x60);
-    DYEPALETTE(palette, SColorAvx2)(&data[0], 8);
-    REQUIRE(data[0] == buildHex(0x70, 0x60, 0x50, 0x10));
-    REQUIRE(data[1] == buildHex(0x70, 0x60, 0x50, 0x20));
-    REQUIRE(data[2] == buildHex(0xff, 0x40, 0x20, 0x10));
-    REQUIRE(data[3] == buildHex(0x70, 0x60, 0x50, 0x20));
-    REQUIRE(data[4] == buildHex(0x70, 0x60, 0x50, 0x10));
-    REQUIRE(data[5] == buildHex(0x70, 0x60, 0x50, 0x40));
-    REQUIRE(data[6] == buildHex(0xff, 0x40, 0x20, 0x50));
-    REQUIRE(data[7] == buildHex(0x70, 0x60, 0x50, 0x60));
-}
-
-TEST_CASE("Dye replaceSColor 9 1 avx2", "")
-{
-    DyePalette palette("#123456,000000,ff3020,706050", 6);
-    uint32_t data[9];
-    data[0] = buildHex(0xff, 0x30, 0x20, 0x10);
-    data[1] = buildHex(0xff, 0x30, 0x20, 0x20);
-    data[2] = buildHex(0xff, 0x40, 0x20, 0x10);
-    data[3] = buildHex(0xff, 0x30, 0x20, 0x20);
-    data[4] = buildHex(0xff, 0x30, 0x20, 0x10);
-    data[5] = buildHex(0xff, 0x30, 0x20, 0x40);
-    data[6] = buildHex(0xff, 0x40, 0x20, 0x50);
-    data[7] = buildHex(0xff, 0x30, 0x20, 0x60);
-    data[8] = buildHex(0xff, 0x30, 0x20, 0x70);
-    DYEPALETTE(palette, SColorAvx2)(&data[0], 9);
-    REQUIRE(data[0] == buildHex(0x70, 0x60, 0x50, 0x10));
-    REQUIRE(data[1] == buildHex(0x70, 0x60, 0x50, 0x20));
-    REQUIRE(data[2] == buildHex(0xff, 0x40, 0x20, 0x10));
-    REQUIRE(data[3] == buildHex(0x70, 0x60, 0x50, 0x20));
-    REQUIRE(data[4] == buildHex(0x70, 0x60, 0x50, 0x10));
-    REQUIRE(data[5] == buildHex(0x70, 0x60, 0x50, 0x40));
-    REQUIRE(data[6] == buildHex(0xff, 0x40, 0x20, 0x50));
-    REQUIRE(data[7] == buildHex(0x70, 0x60, 0x50, 0x60));
-    REQUIRE(data[8] == buildHex(0x70, 0x60, 0x50, 0x70));
-}
-
-TEST_CASE("Dye replaceSColor 10 1 avx2", "")
-{
-    DyePalette palette("#123456,000000,ff3020,706050", 6);
-    uint32_t data[10];
-    data[0] = buildHex(0xff, 0x30, 0x20, 0x10);
-    data[1] = buildHex(0xff, 0x30, 0x20, 0x20);
-    data[2] = buildHex(0xff, 0x40, 0x20, 0x10);
-    data[3] = buildHex(0xff, 0x30, 0x20, 0x20);
-    data[4] = buildHex(0xff, 0x30, 0x20, 0x10);
-    data[5] = buildHex(0xff, 0x30, 0x20, 0x40);
-    data[6] = buildHex(0xff, 0x40, 0x20, 0x50);
-    data[7] = buildHex(0xff, 0x30, 0x20, 0x60);
-    data[8] = buildHex(0x12, 0x34, 0x56, 0x70);
-    data[9] = buildHex(0xff, 0x30, 0x20, 0x80);
-    DYEPALETTE(palette, SColorAvx2)(&data[0], 10);
-    REQUIRE(data[0] == buildHex(0x70, 0x60, 0x50, 0x10));
-    REQUIRE(data[1] == buildHex(0x70, 0x60, 0x50, 0x20));
-    REQUIRE(data[2] == buildHex(0xff, 0x40, 0x20, 0x10));
-    REQUIRE(data[3] == buildHex(0x70, 0x60, 0x50, 0x20));
-    REQUIRE(data[4] == buildHex(0x70, 0x60, 0x50, 0x10));
-    REQUIRE(data[5] == buildHex(0x70, 0x60, 0x50, 0x40));
-    REQUIRE(data[6] == buildHex(0xff, 0x40, 0x20, 0x50));
-    REQUIRE(data[7] == buildHex(0x70, 0x60, 0x50, 0x60));
-    REQUIRE(data[8] == buildHex(0x00, 0x00, 0x00, 0x70));
-    REQUIRE(data[9] == buildHex(0x70, 0x60, 0x50, 0x80));
-}
-
-
-TEST_CASE("Dye replaceAColor 1 1", "")
-{
-    DyePalette palette("#00ff0010,00001120", 8);
-    uint32_t data[1];
-    data[0] = buildHex(0x10, 0x03, 0x02, 0x01);
-    DYEPALETTE(palette, AColor)(&data[0], 1);
-    REQUIRE(data[0] == buildHex(0x10, 0x03, 0x02, 0x01));
-}
-
-TEST_CASE("Dye replaceAColor 1 2", "")
-{
-    DyePalette palette("#02ff0120,040311ff", 8);
-    uint32_t data[1];
-    data[0] = buildHex(0x02, 0xff, 0x01, 0x20);
-    DYEPALETTE(palette, AColor)(&data[0], 1);
-    REQUIRE(data[0] == buildHex(0x04, 0x03, 0x11, 0xff));
-}
-
-TEST_CASE("Dye replaceAColor 1 3", "")
-{
-    DyePalette palette("#40404040,20000000,0100ee40,102030ff", 8);
-    uint32_t data[1];
-    data[0] = buildHex(0x01, 0x00, 0xee, 0x40);
-    DYEPALETTE(palette, AColor)(&data[0], 1);
-    REQUIRE(data[0] == buildHex(0x10, 0x20, 0x30, 0xff));
-}
-
-TEST_CASE("Dye replaceAColor 2 1", "")
-{
-    DyePalette palette("#40404040,20000000,0100ee40,102030ff", 8);
-    uint32_t data[2];
-    data[0] = buildHex(0x01, 0x00, 0xee, 0x40);
-    data[1] = buildHex(0x40, 0x40, 0x40, 0x40);
-    DYEPALETTE(palette, AColor)(&data[0], 2);
-    REQUIRE(data[0] == buildHex(0x10, 0x20, 0x30, 0xff));
-    REQUIRE(data[1] == buildHex(0x20, 0x00, 0x00, 0x00));
-}
-
-TEST_CASE("Dye replaceAColor 3 1", "")
-{
-    DyePalette palette("#40404040,20000000,0100ee40,102030ff", 8);
-    uint32_t data[3];
-    data[0] = buildHex(0x01, 0x00, 0xee, 0x40);
-    data[1] = buildHex(0x50, 0x40, 0x40, 0x30);
-    data[2] = buildHex(0x40, 0x40, 0x40, 0x40);
-    DYEPALETTE(palette, AColor)(&data[0], 3);
-    REQUIRE(data[0] == buildHex(0x10, 0x20, 0x30, 0xff));
-    REQUIRE(data[1] == buildHex(0x50, 0x40, 0x40, 0x30));
-    REQUIRE(data[2] == buildHex(0x20, 0x00, 0x00, 0x00));
-}
-
-TEST_CASE("Dye replaceAColor 4 1", "")
-{
-    DyePalette palette("#40404040,20000000,0100ee40,102030ff", 8);
-    uint32_t data[4];
-    data[0] = buildHex(0x01, 0x00, 0xee, 0x40);
-    data[1] = buildHex(0x40, 0x40, 0x40, 0x40);
-    data[2] = buildHex(0x01, 0x00, 0xee, 0x50);
-    data[3] = buildHex(0x40, 0x40, 0x40, 0x40);
-    DYEPALETTE(palette, AColor)(&data[0], 4);
-    REQUIRE(data[0] == buildHex(0x10, 0x20, 0x30, 0xff));
-    REQUIRE(data[1] == buildHex(0x20, 0x00, 0x00, 0x00));
-    REQUIRE(data[2] == buildHex(0x01, 0x00, 0xee, 0x50));
-    REQUIRE(data[3] == buildHex(0x20, 0x00, 0x00, 0x00));
-}
-
-TEST_CASE("Dye replaceAColor 5 1", "")
-{
-    DyePalette palette("#40404040,20000000,0100ee40,102030ff", 8);
-    uint32_t data[5];
-    data[0] = buildHex(0x01, 0x00, 0xee, 0x40);
-    data[1] = buildHex(0x40, 0x40, 0x40, 0x40);
-    data[2] = buildHex(0x01, 0x00, 0xee, 0x50);
-    data[3] = buildHex(0x50, 0x40, 0x40, 0x60);
-    data[4] = buildHex(0x40, 0x40, 0x40, 0x40);
-    DYEPALETTE(palette, AColor)(&data[0], 5);
-    REQUIRE(data[0] == buildHex(0x10, 0x20, 0x30, 0xff));
-    REQUIRE(data[1] == buildHex(0x20, 0x00, 0x00, 0x00));
-    REQUIRE(data[2] == buildHex(0x01, 0x00, 0xee, 0x50));
-    REQUIRE(data[3] == buildHex(0x50, 0x40, 0x40, 0x60));
-    REQUIRE(data[4] == buildHex(0x20, 0x00, 0x00, 0x00));
-}
-
-TEST_CASE("Dye replaceAColor 7 1", "")
-{
-    DyePalette palette("#40404040,20000000,0100ee40,102030ff", 8);
-    uint32_t data[7];
-    data[0] = buildHex(0x01, 0x00, 0xee, 0x40);
-    data[1] = buildHex(0x40, 0x40, 0x40, 0x40);
-    data[2] = buildHex(0x01, 0x00, 0xee, 0x50);
-    data[3] = buildHex(0x40, 0x40, 0x40, 0x40);
-    data[4] = buildHex(0x01, 0x00, 0xee, 0x40);
-    data[5] = buildHex(0x40, 0x40, 0x41, 0x40);
-    data[6] = buildHex(0x01, 0x00, 0xee, 0x50);
-    DYEPALETTE(palette, AColor)(&data[0], 7);
-    REQUIRE(data[0] == buildHex(0x10, 0x20, 0x30, 0xff));
-    REQUIRE(data[1] == buildHex(0x20, 0x00, 0x00, 0x00));
-    REQUIRE(data[2] == buildHex(0x01, 0x00, 0xee, 0x50));
-    REQUIRE(data[3] == buildHex(0x20, 0x00, 0x00, 0x00));
-    REQUIRE(data[4] == buildHex(0x10, 0x20, 0x30, 0xff));
-    REQUIRE(data[5] == buildHex(0x40, 0x40, 0x41, 0x40));
-    REQUIRE(data[6] == buildHex(0x01, 0x00, 0xee, 0x50));
-}
-
-TEST_CASE("Dye replaceAColor 8 1", "")
-{
-    DyePalette palette("#40404040,20000000,0100ee40,102030ff", 8);
-    uint32_t data[8];
-    data[0] = buildHex(0x01, 0x00, 0xee, 0x40);
-    data[1] = buildHex(0x40, 0x40, 0x40, 0x40);
-    data[2] = buildHex(0x01, 0x00, 0xee, 0x50);
-    data[3] = buildHex(0x40, 0x40, 0x40, 0x40);
-    data[4] = buildHex(0x01, 0x00, 0xee, 0x40);
-    data[5] = buildHex(0x40, 0x40, 0x41, 0x40);
-    data[6] = buildHex(0x01, 0x00, 0xee, 0x50);
-    data[7] = buildHex(0x40, 0x40, 0x40, 0x40);
-    DYEPALETTE(palette, AColor)(&data[0], 8);
-    REQUIRE(data[0] == buildHex(0x10, 0x20, 0x30, 0xff));
-    REQUIRE(data[1] == buildHex(0x20, 0x00, 0x00, 0x00));
-    REQUIRE(data[2] == buildHex(0x01, 0x00, 0xee, 0x50));
-    REQUIRE(data[3] == buildHex(0x20, 0x00, 0x00, 0x00));
-    REQUIRE(data[4] == buildHex(0x10, 0x20, 0x30, 0xff));
-    REQUIRE(data[5] == buildHex(0x40, 0x40, 0x41, 0x40));
-    REQUIRE(data[6] == buildHex(0x01, 0x00, 0xee, 0x50));
-    REQUIRE(data[7] == buildHex(0x20, 0x00, 0x00, 0x00));
-}
-
-TEST_CASE("Dye replaceAColor 9 1", "")
-{
-    DyePalette palette("#40404040,20000000,0100ee40,102030ff", 8);
-    uint32_t data[9];
-    data[0] = buildHex(0x01, 0x00, 0xee, 0x40);
-    data[1] = buildHex(0x40, 0x40, 0x40, 0x40);
-    data[2] = buildHex(0x01, 0x00, 0xee, 0x50);
-    data[3] = buildHex(0x40, 0x40, 0x40, 0x40);
-    data[4] = buildHex(0x01, 0x00, 0xee, 0x40);
-    data[5] = buildHex(0x40, 0x40, 0x41, 0x40);
-    data[6] = buildHex(0x01, 0x00, 0xee, 0x50);
-    data[7] = buildHex(0x02, 0x40, 0x40, 0x40);
-    data[8] = buildHex(0x40, 0x40, 0x40, 0x40);
-    DYEPALETTE(palette, AColor)(&data[0], 9);
-    REQUIRE(data[0] == buildHex(0x10, 0x20, 0x30, 0xff));
-    REQUIRE(data[1] == buildHex(0x20, 0x00, 0x00, 0x00));
-    REQUIRE(data[2] == buildHex(0x01, 0x00, 0xee, 0x50));
-    REQUIRE(data[3] == buildHex(0x20, 0x00, 0x00, 0x00));
-    REQUIRE(data[4] == buildHex(0x10, 0x20, 0x30, 0xff));
-    REQUIRE(data[5] == buildHex(0x40, 0x40, 0x41, 0x40));
-    REQUIRE(data[6] == buildHex(0x01, 0x00, 0xee, 0x50));
-    REQUIRE(data[7] == buildHex(0x02, 0x40, 0x40, 0x40));
-    REQUIRE(data[8] == buildHex(0x20, 0x00, 0x00, 0x00));
-}
-
-TEST_CASE("Dye replaceAColor 10 1", "")
-{
-    DyePalette palette("#40404040,20000000,0100ee40,102030ff", 8);
-    uint32_t data[10];
-    data[0] = buildHex(0x01, 0x00, 0xee, 0x40);
-    data[1] = buildHex(0x40, 0x40, 0x40, 0x40);
-    data[2] = buildHex(0x01, 0x00, 0xee, 0x50);
-    data[3] = buildHex(0x40, 0x40, 0x40, 0x40);
-    data[4] = buildHex(0x01, 0x00, 0xee, 0x40);
-    data[5] = buildHex(0x40, 0x40, 0x41, 0x40);
-    data[6] = buildHex(0x01, 0x00, 0xee, 0x50);
-    data[7] = buildHex(0x02, 0x40, 0x40, 0x40);
-    data[8] = buildHex(0x40, 0x40, 0x40, 0x40);
-    data[9] = buildHex(0x01, 0x00, 0xee, 0x40);
-    DYEPALETTE(palette, AColor)(&data[0], 10);
-    REQUIRE(data[0] == buildHex(0x10, 0x20, 0x30, 0xff));
-    REQUIRE(data[1] == buildHex(0x20, 0x00, 0x00, 0x00));
-    REQUIRE(data[2] == buildHex(0x01, 0x00, 0xee, 0x50));
-    REQUIRE(data[3] == buildHex(0x20, 0x00, 0x00, 0x00));
-    REQUIRE(data[4] == buildHex(0x10, 0x20, 0x30, 0xff));
-    REQUIRE(data[5] == buildHex(0x40, 0x40, 0x41, 0x40));
-    REQUIRE(data[6] == buildHex(0x01, 0x00, 0xee, 0x50));
-    REQUIRE(data[7] == buildHex(0x02, 0x40, 0x40, 0x40));
-    REQUIRE(data[8] == buildHex(0x20, 0x00, 0x00, 0x00));
-    REQUIRE(data[9] == buildHex(0x10, 0x20, 0x30, 0xff));
-}
-
-TEST_CASE("Dye replaceAColor 1 1 default", "")
-{
-    DyePalette palette("#00ff0010,00001120", 8);
-    uint32_t data[1];
-    data[0] = buildHex(0x10, 0x03, 0x02, 0x01);
-    palette.replaceAColorDefault(&data[0], 1);
-    REQUIRE(data[0] == buildHex(0x10, 0x03, 0x02, 0x01));
-}
-
-TEST_CASE("Dye replaceAColor 1 2 default", "")
-{
-    DyePalette palette("#02ff0120,040311ff", 8);
-    uint32_t data[1];
-    data[0] = buildHex(0x02, 0xff, 0x01, 0x20);
-    palette.replaceAColorDefault(&data[0], 1);
-    REQUIRE(data[0] == buildHex(0x04, 0x03, 0x11, 0xff));
-}
-
-TEST_CASE("Dye replaceAColor 1 3 default", "")
-{
-    DyePalette palette("#40404040,20000000,0100ee40,102030ff", 8);
-    uint32_t data[1];
-    data[0] = buildHex(0x01, 0x00, 0xee, 0x40);
-    palette.replaceAColorDefault(&data[0], 1);
-    REQUIRE(data[0] == buildHex(0x10, 0x20, 0x30, 0xff));
-}
-
-TEST_CASE("Dye replaceAColor 2 1 default", "")
-{
-    DyePalette palette("#40404040,20000000,0100ee40,102030ff", 8);
-    uint32_t data[2];
-    data[0] = buildHex(0x01, 0x00, 0xee, 0x40);
-    data[1] = buildHex(0x40, 0x40, 0x40, 0x40);
-    palette.replaceAColorDefault(&data[0], 2);
-    REQUIRE(data[0] == buildHex(0x10, 0x20, 0x30, 0xff));
-    REQUIRE(data[1] == buildHex(0x20, 0x00, 0x00, 0x00));
-}
-
-TEST_CASE("Dye replaceAColor 3 1 default", "")
-{
-    DyePalette palette("#40404040,20000000,0100ee40,102030ff", 8);
-    uint32_t data[3];
-    data[0] = buildHex(0x01, 0x00, 0xee, 0x40);
-    data[1] = buildHex(0x50, 0x40, 0x40, 0x30);
-    data[2] = buildHex(0x40, 0x40, 0x40, 0x40);
-    palette.replaceAColorDefault(&data[0], 3);
-    REQUIRE(data[0] == buildHex(0x10, 0x20, 0x30, 0xff));
-    REQUIRE(data[1] == buildHex(0x50, 0x40, 0x40, 0x30));
-    REQUIRE(data[2] == buildHex(0x20, 0x00, 0x00, 0x00));
-}
-
-TEST_CASE("Dye replaceAColor 4 1 default", "")
-{
-    DyePalette palette("#40404040,20000000,0100ee40,102030ff", 8);
-    uint32_t data[4];
-    data[0] = buildHex(0x01, 0x00, 0xee, 0x40);
-    data[1] = buildHex(0x40, 0x40, 0x40, 0x40);
-    data[2] = buildHex(0x01, 0x00, 0xee, 0x50);
-    data[3] = buildHex(0x40, 0x40, 0x40, 0x40);
-    palette.replaceAColorDefault(&data[0], 4);
-    REQUIRE(data[0] == buildHex(0x10, 0x20, 0x30, 0xff));
-    REQUIRE(data[1] == buildHex(0x20, 0x00, 0x00, 0x00));
-    REQUIRE(data[2] == buildHex(0x01, 0x00, 0xee, 0x50));
-    REQUIRE(data[3] == buildHex(0x20, 0x00, 0x00, 0x00));
-}
-
-TEST_CASE("Dye replaceAColor 5 1 default", "")
-{
-    DyePalette palette("#40404040,20000000,0100ee40,102030ff", 8);
-    uint32_t data[5];
-    data[0] = buildHex(0x01, 0x00, 0xee, 0x40);
-    data[1] = buildHex(0x40, 0x40, 0x40, 0x40);
-    data[2] = buildHex(0x01, 0x00, 0xee, 0x50);
-    data[3] = buildHex(0x50, 0x40, 0x40, 0x60);
-    data[4] = buildHex(0x40, 0x40, 0x40, 0x40);
-    palette.replaceAColorDefault(&data[0], 5);
-    REQUIRE(data[0] == buildHex(0x10, 0x20, 0x30, 0xff));
-    REQUIRE(data[1] == buildHex(0x20, 0x00, 0x00, 0x00));
-    REQUIRE(data[2] == buildHex(0x01, 0x00, 0xee, 0x50));
-    REQUIRE(data[3] == buildHex(0x50, 0x40, 0x40, 0x60));
-    REQUIRE(data[4] == buildHex(0x20, 0x00, 0x00, 0x00));
-}
-
-TEST_CASE("Dye replaceAColor 7 1 default", "")
-{
-    DyePalette palette("#40404040,20000000,0100ee40,102030ff", 8);
-    uint32_t data[7];
-    data[0] = buildHex(0x01, 0x00, 0xee, 0x40);
-    data[1] = buildHex(0x40, 0x40, 0x40, 0x40);
-    data[2] = buildHex(0x01, 0x00, 0xee, 0x50);
-    data[3] = buildHex(0x40, 0x40, 0x40, 0x40);
-    data[4] = buildHex(0x01, 0x00, 0xee, 0x40);
-    data[5] = buildHex(0x40, 0x40, 0x41, 0x40);
-    data[6] = buildHex(0x01, 0x00, 0xee, 0x50);
-    palette.replaceAColorDefault(&data[0], 7);
-    REQUIRE(data[0] == buildHex(0x10, 0x20, 0x30, 0xff));
-    REQUIRE(data[1] == buildHex(0x20, 0x00, 0x00, 0x00));
-    REQUIRE(data[2] == buildHex(0x01, 0x00, 0xee, 0x50));
-    REQUIRE(data[3] == buildHex(0x20, 0x00, 0x00, 0x00));
-    REQUIRE(data[4] == buildHex(0x10, 0x20, 0x30, 0xff));
-    REQUIRE(data[5] == buildHex(0x40, 0x40, 0x41, 0x40));
-    REQUIRE(data[6] == buildHex(0x01, 0x00, 0xee, 0x50));
-}
-
-TEST_CASE("Dye replaceAColor 8 1 default", "")
-{
-    DyePalette palette("#40404040,20000000,0100ee40,102030ff", 8);
-    uint32_t data[8];
-    data[0] = buildHex(0x01, 0x00, 0xee, 0x40);
-    data[1] = buildHex(0x40, 0x40, 0x40, 0x40);
-    data[2] = buildHex(0x01, 0x00, 0xee, 0x50);
-    data[3] = buildHex(0x40, 0x40, 0x40, 0x40);
-    data[4] = buildHex(0x01, 0x00, 0xee, 0x40);
-    data[5] = buildHex(0x40, 0x40, 0x41, 0x40);
-    data[6] = buildHex(0x01, 0x00, 0xee, 0x50);
-    data[7] = buildHex(0x40, 0x40, 0x40, 0x40);
-    palette.replaceAColorDefault(&data[0], 8);
-    REQUIRE(data[0] == buildHex(0x10, 0x20, 0x30, 0xff));
-    REQUIRE(data[1] == buildHex(0x20, 0x00, 0x00, 0x00));
-    REQUIRE(data[2] == buildHex(0x01, 0x00, 0xee, 0x50));
-    REQUIRE(data[3] == buildHex(0x20, 0x00, 0x00, 0x00));
-    REQUIRE(data[4] == buildHex(0x10, 0x20, 0x30, 0xff));
-    REQUIRE(data[5] == buildHex(0x40, 0x40, 0x41, 0x40));
-    REQUIRE(data[6] == buildHex(0x01, 0x00, 0xee, 0x50));
-    REQUIRE(data[7] == buildHex(0x20, 0x00, 0x00, 0x00));
-}
-
-TEST_CASE("Dye replaceAColor 9 1 default", "")
-{
-    DyePalette palette("#40404040,20000000,0100ee40,102030ff", 8);
-    uint32_t data[9];
-    data[0] = buildHex(0x01, 0x00, 0xee, 0x40);
-    data[1] = buildHex(0x40, 0x40, 0x40, 0x40);
-    data[2] = buildHex(0x01, 0x00, 0xee, 0x50);
-    data[3] = buildHex(0x40, 0x40, 0x40, 0x40);
-    data[4] = buildHex(0x01, 0x00, 0xee, 0x40);
-    data[5] = buildHex(0x40, 0x40, 0x41, 0x40);
-    data[6] = buildHex(0x01, 0x00, 0xee, 0x50);
-    data[7] = buildHex(0x02, 0x40, 0x40, 0x40);
-    data[8] = buildHex(0x40, 0x40, 0x40, 0x40);
-    palette.replaceAColorDefault(&data[0], 9);
-    REQUIRE(data[0] == buildHex(0x10, 0x20, 0x30, 0xff));
-    REQUIRE(data[1] == buildHex(0x20, 0x00, 0x00, 0x00));
-    REQUIRE(data[2] == buildHex(0x01, 0x00, 0xee, 0x50));
-    REQUIRE(data[3] == buildHex(0x20, 0x00, 0x00, 0x00));
-    REQUIRE(data[4] == buildHex(0x10, 0x20, 0x30, 0xff));
-    REQUIRE(data[5] == buildHex(0x40, 0x40, 0x41, 0x40));
-    REQUIRE(data[6] == buildHex(0x01, 0x00, 0xee, 0x50));
-    REQUIRE(data[7] == buildHex(0x02, 0x40, 0x40, 0x40));
-    REQUIRE(data[8] == buildHex(0x20, 0x00, 0x00, 0x00));
-}
-
-TEST_CASE("Dye replaceAColor 10 1 default", "")
-{
-    DyePalette palette("#40404040,20000000,0100ee40,102030ff", 8);
-    uint32_t data[10];
-    data[0] = buildHex(0x01, 0x00, 0xee, 0x40);
-    data[1] = buildHex(0x40, 0x40, 0x40, 0x40);
-    data[2] = buildHex(0x01, 0x00, 0xee, 0x50);
-    data[3] = buildHex(0x40, 0x40, 0x40, 0x40);
-    data[4] = buildHex(0x01, 0x00, 0xee, 0x40);
-    data[5] = buildHex(0x40, 0x40, 0x41, 0x40);
-    data[6] = buildHex(0x01, 0x00, 0xee, 0x50);
-    data[7] = buildHex(0x02, 0x40, 0x40, 0x40);
-    data[8] = buildHex(0x40, 0x40, 0x40, 0x40);
-    data[9] = buildHex(0x01, 0x00, 0xee, 0x40);
-    palette.replaceAColorDefault(&data[0], 10);
-    REQUIRE(data[0] == buildHex(0x10, 0x20, 0x30, 0xff));
-    REQUIRE(data[1] == buildHex(0x20, 0x00, 0x00, 0x00));
-    REQUIRE(data[2] == buildHex(0x01, 0x00, 0xee, 0x50));
-    REQUIRE(data[3] == buildHex(0x20, 0x00, 0x00, 0x00));
-    REQUIRE(data[4] == buildHex(0x10, 0x20, 0x30, 0xff));
-    REQUIRE(data[5] == buildHex(0x40, 0x40, 0x41, 0x40));
-    REQUIRE(data[6] == buildHex(0x01, 0x00, 0xee, 0x50));
-    REQUIRE(data[7] == buildHex(0x02, 0x40, 0x40, 0x40));
-    REQUIRE(data[8] == buildHex(0x20, 0x00, 0x00, 0x00));
-    REQUIRE(data[9] == buildHex(0x10, 0x20, 0x30, 0xff));
-}
-
-TEST_CASE("Dye replaceAColor 1 1 sse2", "")
-{
-    DyePalette palette("#00ff0010,00001120", 8);
-    uint32_t data[1];
-    data[0] = buildHex(0x10, 0x03, 0x02, 0x01);
-    DYEPALETTE(palette, AColorSse2)(&data[0], 1);
-    REQUIRE(data[0] == buildHex(0x10, 0x03, 0x02, 0x01));
-}
-
-TEST_CASE("Dye replaceAColor 1 2 sse2", "")
-{
-    DyePalette palette("#02ff0120,040311ff", 8);
-    uint32_t data[1];
-    data[0] = buildHex(0x02, 0xff, 0x01, 0x20);
-    DYEPALETTE(palette, AColorSse2)(&data[0], 1);
-    REQUIRE(data[0] == buildHex(0x04, 0x03, 0x11, 0xff));
-}
-
-TEST_CASE("Dye replaceAColor 1 3 sse2", "")
-{
-    DyePalette palette("#40404040,20000000,0100ee40,102030ff", 8);
-    uint32_t data[1];
-    data[0] = buildHex(0x01, 0x00, 0xee, 0x40);
-    DYEPALETTE(palette, AColorSse2)(&data[0], 1);
-    REQUIRE(data[0] == buildHex(0x10, 0x20, 0x30, 0xff));
-}
-
-TEST_CASE("Dye replaceAColor 2 1 sse2", "")
-{
-    DyePalette palette("#40404040,20000000,0100ee40,102030ff", 8);
-    uint32_t data[2];
-    data[0] = buildHex(0x01, 0x00, 0xee, 0x40);
-    data[1] = buildHex(0x40, 0x40, 0x40, 0x40);
-    DYEPALETTE(palette, AColorSse2)(&data[0], 2);
-    REQUIRE(data[0] == buildHex(0x10, 0x20, 0x30, 0xff));
-    REQUIRE(data[1] == buildHex(0x20, 0x00, 0x00, 0x00));
-}
-
-TEST_CASE("Dye replaceAColor 3 1 sse2", "")
-{
-    DyePalette palette("#40404040,20000000,0100ee40,102030ff", 8);
-    uint32_t data[3];
-    data[0] = buildHex(0x01, 0x00, 0xee, 0x40);
-    data[1] = buildHex(0x50, 0x40, 0x40, 0x30);
-    data[2] = buildHex(0x40, 0x40, 0x40, 0x40);
-    DYEPALETTE(palette, AColorSse2)(&data[0], 3);
-    REQUIRE(data[0] == buildHex(0x10, 0x20, 0x30, 0xff));
-    REQUIRE(data[1] == buildHex(0x50, 0x40, 0x40, 0x30));
-    REQUIRE(data[2] == buildHex(0x20, 0x00, 0x00, 0x00));
-}
-
-TEST_CASE("Dye replaceAColor 4 1 sse2", "")
-{
-    DyePalette palette("#40404040,20000000,0100ee40,102030ff", 8);
-    uint32_t data[4];
-    data[0] = buildHex(0x01, 0x00, 0xee, 0x40);
-    data[1] = buildHex(0x40, 0x40, 0x40, 0x40);
-    data[2] = buildHex(0x01, 0x00, 0xee, 0x50);
-    data[3] = buildHex(0x40, 0x40, 0x40, 0x40);
-    DYEPALETTE(palette, AColorSse2)(&data[0], 4);
-    REQUIRE(data[0] == buildHex(0x10, 0x20, 0x30, 0xff));
-    REQUIRE(data[1] == buildHex(0x20, 0x00, 0x00, 0x00));
-    REQUIRE(data[2] == buildHex(0x01, 0x00, 0xee, 0x50));
-    REQUIRE(data[3] == buildHex(0x20, 0x00, 0x00, 0x00));
-}
-
-TEST_CASE("Dye replaceAColor 5 1 sse2", "")
-{
-    DyePalette palette("#40404040,20000000,0100ee40,102030ff", 8);
-    uint32_t data[5];
-    data[0] = buildHex(0x01, 0x00, 0xee, 0x40);
-    data[1] = buildHex(0x40, 0x40, 0x40, 0x40);
-    data[2] = buildHex(0x01, 0x00, 0xee, 0x50);
-    data[3] = buildHex(0x50, 0x40, 0x40, 0x60);
-    data[4] = buildHex(0x40, 0x40, 0x40, 0x40);
-    DYEPALETTE(palette, AColorSse2)(&data[0], 5);
-    REQUIRE(data[0] == buildHex(0x10, 0x20, 0x30, 0xff));
-    REQUIRE(data[1] == buildHex(0x20, 0x00, 0x00, 0x00));
-    REQUIRE(data[2] == buildHex(0x01, 0x00, 0xee, 0x50));
-    REQUIRE(data[3] == buildHex(0x50, 0x40, 0x40, 0x60));
-    REQUIRE(data[4] == buildHex(0x20, 0x00, 0x00, 0x00));
-}
-
-TEST_CASE("Dye replaceAColor 7 1 sse2", "")
-{
-    DyePalette palette("#40404040,20000000,0100ee40,102030ff", 8);
-    uint32_t data[7];
-    data[0] = buildHex(0x01, 0x00, 0xee, 0x40);
-    data[1] = buildHex(0x40, 0x40, 0x40, 0x40);
-    data[2] = buildHex(0x01, 0x00, 0xee, 0x50);
-    data[3] = buildHex(0x40, 0x40, 0x40, 0x40);
-    data[4] = buildHex(0x01, 0x00, 0xee, 0x40);
-    data[5] = buildHex(0x40, 0x40, 0x41, 0x40);
-    data[6] = buildHex(0x01, 0x00, 0xee, 0x50);
-    DYEPALETTE(palette, AColorSse2)(&data[0], 7);
-    REQUIRE(data[0] == buildHex(0x10, 0x20, 0x30, 0xff));
-    REQUIRE(data[1] == buildHex(0x20, 0x00, 0x00, 0x00));
-    REQUIRE(data[2] == buildHex(0x01, 0x00, 0xee, 0x50));
-    REQUIRE(data[3] == buildHex(0x20, 0x00, 0x00, 0x00));
-    REQUIRE(data[4] == buildHex(0x10, 0x20, 0x30, 0xff));
-    REQUIRE(data[5] == buildHex(0x40, 0x40, 0x41, 0x40));
-    REQUIRE(data[6] == buildHex(0x01, 0x00, 0xee, 0x50));
-}
-
-TEST_CASE("Dye replaceAColor 8 1 sse2", "")
-{
-    DyePalette palette("#40404040,20000000,0100ee40,102030ff", 8);
-    uint32_t data[8];
-    data[0] = buildHex(0x01, 0x00, 0xee, 0x40);
-    data[1] = buildHex(0x40, 0x40, 0x40, 0x40);
-    data[2] = buildHex(0x01, 0x00, 0xee, 0x50);
-    data[3] = buildHex(0x40, 0x40, 0x40, 0x40);
-    data[4] = buildHex(0x01, 0x00, 0xee, 0x40);
-    data[5] = buildHex(0x40, 0x40, 0x41, 0x40);
-    data[6] = buildHex(0x01, 0x00, 0xee, 0x50);
-    data[7] = buildHex(0x40, 0x40, 0x40, 0x40);
-    DYEPALETTE(palette, AColorSse2)(&data[0], 8);
-    REQUIRE(data[0] == buildHex(0x10, 0x20, 0x30, 0xff));
-    REQUIRE(data[1] == buildHex(0x20, 0x00, 0x00, 0x00));
-    REQUIRE(data[2] == buildHex(0x01, 0x00, 0xee, 0x50));
-    REQUIRE(data[3] == buildHex(0x20, 0x00, 0x00, 0x00));
-    REQUIRE(data[4] == buildHex(0x10, 0x20, 0x30, 0xff));
-    REQUIRE(data[5] == buildHex(0x40, 0x40, 0x41, 0x40));
-    REQUIRE(data[6] == buildHex(0x01, 0x00, 0xee, 0x50));
-    REQUIRE(data[7] == buildHex(0x20, 0x00, 0x00, 0x00));
-}
-
-TEST_CASE("Dye replaceAColor 9 1 sse2", "")
-{
-    DyePalette palette("#40404040,20000000,0100ee40,102030ff", 8);
-    uint32_t data[9];
-    data[0] = buildHex(0x01, 0x00, 0xee, 0x40);
-    data[1] = buildHex(0x40, 0x40, 0x40, 0x40);
-    data[2] = buildHex(0x01, 0x00, 0xee, 0x50);
-    data[3] = buildHex(0x40, 0x40, 0x40, 0x40);
-    data[4] = buildHex(0x01, 0x00, 0xee, 0x40);
-    data[5] = buildHex(0x40, 0x40, 0x41, 0x40);
-    data[6] = buildHex(0x01, 0x00, 0xee, 0x50);
-    data[7] = buildHex(0x02, 0x40, 0x40, 0x40);
-    data[8] = buildHex(0x40, 0x40, 0x40, 0x40);
-    DYEPALETTE(palette, AColorSse2)(&data[0], 9);
-    REQUIRE(data[0] == buildHex(0x10, 0x20, 0x30, 0xff));
-    REQUIRE(data[1] == buildHex(0x20, 0x00, 0x00, 0x00));
-    REQUIRE(data[2] == buildHex(0x01, 0x00, 0xee, 0x50));
-    REQUIRE(data[3] == buildHex(0x20, 0x00, 0x00, 0x00));
-    REQUIRE(data[4] == buildHex(0x10, 0x20, 0x30, 0xff));
-    REQUIRE(data[5] == buildHex(0x40, 0x40, 0x41, 0x40));
-    REQUIRE(data[6] == buildHex(0x01, 0x00, 0xee, 0x50));
-    REQUIRE(data[7] == buildHex(0x02, 0x40, 0x40, 0x40));
-    REQUIRE(data[8] == buildHex(0x20, 0x00, 0x00, 0x00));
-}
-
-TEST_CASE("Dye replaceAColor 10 1 sse2", "")
-{
-    DyePalette palette("#40404040,20000000,0100ee40,102030ff", 8);
-    uint32_t data[10];
-    data[0] = buildHex(0x01, 0x00, 0xee, 0x40);
-    data[1] = buildHex(0x40, 0x40, 0x40, 0x40);
-    data[2] = buildHex(0x01, 0x00, 0xee, 0x50);
-    data[3] = buildHex(0x40, 0x40, 0x40, 0x40);
-    data[4] = buildHex(0x01, 0x00, 0xee, 0x40);
-    data[5] = buildHex(0x40, 0x40, 0x41, 0x40);
-    data[6] = buildHex(0x01, 0x00, 0xee, 0x50);
-    data[7] = buildHex(0x02, 0x40, 0x40, 0x40);
-    data[8] = buildHex(0x40, 0x40, 0x40, 0x40);
-    data[9] = buildHex(0x01, 0x00, 0xee, 0x40);
-    DYEPALETTE(palette, AColorSse2)(&data[0], 10);
-    REQUIRE(data[0] == buildHex(0x10, 0x20, 0x30, 0xff));
-    REQUIRE(data[1] == buildHex(0x20, 0x00, 0x00, 0x00));
-    REQUIRE(data[2] == buildHex(0x01, 0x00, 0xee, 0x50));
-    REQUIRE(data[3] == buildHex(0x20, 0x00, 0x00, 0x00));
-    REQUIRE(data[4] == buildHex(0x10, 0x20, 0x30, 0xff));
-    REQUIRE(data[5] == buildHex(0x40, 0x40, 0x41, 0x40));
-    REQUIRE(data[6] == buildHex(0x01, 0x00, 0xee, 0x50));
-    REQUIRE(data[7] == buildHex(0x02, 0x40, 0x40, 0x40));
-    REQUIRE(data[8] == buildHex(0x20, 0x00, 0x00, 0x00));
-    REQUIRE(data[9] == buildHex(0x10, 0x20, 0x30, 0xff));
-}
-
-TEST_CASE("Dye replaceAColor 1 1 avx2", "")
-{
-    DyePalette palette("#00ff0010,00001120", 8);
-    uint32_t data[1];
-    data[0] = buildHex(0x10, 0x03, 0x02, 0x01);
-    DYEPALETTE(palette, AColorAvx2)(&data[0], 1);
-    REQUIRE(data[0] == buildHex(0x10, 0x03, 0x02, 0x01));
-}
-
-TEST_CASE("Dye replaceAColor 1 2 avx2", "")
-{
-    DyePalette palette("#02ff0120,040311ff", 8);
-    uint32_t data[1];
-    data[0] = buildHex(0x02, 0xff, 0x01, 0x20);
-    DYEPALETTE(palette, AColorAvx2)(&data[0], 1);
-    REQUIRE(data[0] == buildHex(0x04, 0x03, 0x11, 0xff));
-}
-
-TEST_CASE("Dye replaceAColor 1 3 avx2", "")
-{
-    DyePalette palette("#40404040,20000000,0100ee40,102030ff", 8);
-    uint32_t data[1];
-    data[0] = buildHex(0x01, 0x00, 0xee, 0x40);
-    DYEPALETTE(palette, AColorAvx2)(&data[0], 1);
-    REQUIRE(data[0] == buildHex(0x10, 0x20, 0x30, 0xff));
-}
-
-TEST_CASE("Dye replaceAColor 2 1 avx2", "")
-{
-    DyePalette palette("#40404040,20000000,0100ee40,102030ff", 8);
-    uint32_t data[2];
-    data[0] = buildHex(0x01, 0x00, 0xee, 0x40);
-    data[1] = buildHex(0x40, 0x40, 0x40, 0x40);
-    DYEPALETTE(palette, AColorAvx2)(&data[0], 2);
-    REQUIRE(data[0] == buildHex(0x10, 0x20, 0x30, 0xff));
-    REQUIRE(data[1] == buildHex(0x20, 0x00, 0x00, 0x00));
-}
-
-TEST_CASE("Dye replaceAColor 3 1 avx2", "")
-{
-    DyePalette palette("#40404040,20000000,0100ee40,102030ff", 8);
-    uint32_t data[3];
-    data[0] = buildHex(0x01, 0x00, 0xee, 0x40);
-    data[1] = buildHex(0x50, 0x40, 0x40, 0x30);
-    data[2] = buildHex(0x40, 0x40, 0x40, 0x40);
-    DYEPALETTE(palette, AColorAvx2)(&data[0], 3);
-    REQUIRE(data[0] == buildHex(0x10, 0x20, 0x30, 0xff));
-    REQUIRE(data[1] == buildHex(0x50, 0x40, 0x40, 0x30));
-    REQUIRE(data[2] == buildHex(0x20, 0x00, 0x00, 0x00));
-}
-
-TEST_CASE("Dye replaceAColor 4 1 avx2", "")
-{
-    DyePalette palette("#40404040,20000000,0100ee40,102030ff", 8);
-    uint32_t data[4];
-    data[0] = buildHex(0x01, 0x00, 0xee, 0x40);
-    data[1] = buildHex(0x40, 0x40, 0x40, 0x40);
-    data[2] = buildHex(0x01, 0x00, 0xee, 0x50);
-    data[3] = buildHex(0x40, 0x40, 0x40, 0x40);
-    DYEPALETTE(palette, AColorAvx2)(&data[0], 4);
-    REQUIRE(data[0] == buildHex(0x10, 0x20, 0x30, 0xff));
-    REQUIRE(data[1] == buildHex(0x20, 0x00, 0x00, 0x00));
-    REQUIRE(data[2] == buildHex(0x01, 0x00, 0xee, 0x50));
-    REQUIRE(data[3] == buildHex(0x20, 0x00, 0x00, 0x00));
-}
-
-TEST_CASE("Dye replaceAColor 5 1 avx2", "")
-{
-    DyePalette palette("#40404040,20000000,0100ee40,102030ff", 8);
-    uint32_t data[5];
-    data[0] = buildHex(0x01, 0x00, 0xee, 0x40);
-    data[1] = buildHex(0x40, 0x40, 0x40, 0x40);
-    data[2] = buildHex(0x01, 0x00, 0xee, 0x50);
-    data[3] = buildHex(0x50, 0x40, 0x40, 0x60);
-    data[4] = buildHex(0x40, 0x40, 0x40, 0x40);
-    DYEPALETTE(palette, AColorAvx2)(&data[0], 5);
-    REQUIRE(data[0] == buildHex(0x10, 0x20, 0x30, 0xff));
-    REQUIRE(data[1] == buildHex(0x20, 0x00, 0x00, 0x00));
-    REQUIRE(data[2] == buildHex(0x01, 0x00, 0xee, 0x50));
-    REQUIRE(data[3] == buildHex(0x50, 0x40, 0x40, 0x60));
-    REQUIRE(data[4] == buildHex(0x20, 0x00, 0x00, 0x00));
-}
-
-TEST_CASE("Dye replaceAColor 7 1 avx2", "")
-{
-    DyePalette palette("#40404040,20000000,0100ee40,102030ff", 8);
-    uint32_t data[7];
-    data[0] = buildHex(0x01, 0x00, 0xee, 0x40);
-    data[1] = buildHex(0x40, 0x40, 0x40, 0x40);
-    data[2] = buildHex(0x01, 0x00, 0xee, 0x50);
-    data[3] = buildHex(0x40, 0x40, 0x40, 0x40);
-    data[4] = buildHex(0x01, 0x00, 0xee, 0x40);
-    data[5] = buildHex(0x40, 0x40, 0x41, 0x40);
-    data[6] = buildHex(0x01, 0x00, 0xee, 0x50);
-    DYEPALETTE(palette, AColorAvx2)(&data[0], 7);
-    REQUIRE(data[0] == buildHex(0x10, 0x20, 0x30, 0xff));
-    REQUIRE(data[1] == buildHex(0x20, 0x00, 0x00, 0x00));
-    REQUIRE(data[2] == buildHex(0x01, 0x00, 0xee, 0x50));
-    REQUIRE(data[3] == buildHex(0x20, 0x00, 0x00, 0x00));
-    REQUIRE(data[4] == buildHex(0x10, 0x20, 0x30, 0xff));
-    REQUIRE(data[5] == buildHex(0x40, 0x40, 0x41, 0x40));
-    REQUIRE(data[6] == buildHex(0x01, 0x00, 0xee, 0x50));
-}
-
-TEST_CASE("Dye replaceAColor 8 1 avx2", "")
-{
-    DyePalette palette("#40404040,20000000,0100ee40,102030ff", 8);
-    uint32_t data[8];
-    data[0] = buildHex(0x01, 0x00, 0xee, 0x40);
-    data[1] = buildHex(0x40, 0x40, 0x40, 0x40);
-    data[2] = buildHex(0x01, 0x00, 0xee, 0x50);
-    data[3] = buildHex(0x40, 0x40, 0x40, 0x40);
-    data[4] = buildHex(0x01, 0x00, 0xee, 0x40);
-    data[5] = buildHex(0x40, 0x40, 0x41, 0x40);
-    data[6] = buildHex(0x01, 0x00, 0xee, 0x50);
-    data[7] = buildHex(0x40, 0x40, 0x40, 0x40);
-    DYEPALETTE(palette, AColorAvx2)(&data[0], 8);
-    REQUIRE(data[0] == buildHex(0x10, 0x20, 0x30, 0xff));
-    REQUIRE(data[1] == buildHex(0x20, 0x00, 0x00, 0x00));
-    REQUIRE(data[2] == buildHex(0x01, 0x00, 0xee, 0x50));
-    REQUIRE(data[3] == buildHex(0x20, 0x00, 0x00, 0x00));
-    REQUIRE(data[4] == buildHex(0x10, 0x20, 0x30, 0xff));
-    REQUIRE(data[5] == buildHex(0x40, 0x40, 0x41, 0x40));
-    REQUIRE(data[6] == buildHex(0x01, 0x00, 0xee, 0x50));
-    REQUIRE(data[7] == buildHex(0x20, 0x00, 0x00, 0x00));
-}
-
-TEST_CASE("Dye replaceAColor 9 1 avx2", "")
-{
-    DyePalette palette("#40404040,20000000,0100ee40,102030ff", 8);
-    uint32_t data[9];
-    data[0] = buildHex(0x01, 0x00, 0xee, 0x40);
-    data[1] = buildHex(0x40, 0x40, 0x40, 0x40);
-    data[2] = buildHex(0x01, 0x00, 0xee, 0x50);
-    data[3] = buildHex(0x40, 0x40, 0x40, 0x40);
-    data[4] = buildHex(0x01, 0x00, 0xee, 0x40);
-    data[5] = buildHex(0x40, 0x40, 0x41, 0x40);
-    data[6] = buildHex(0x01, 0x00, 0xee, 0x50);
-    data[7] = buildHex(0x02, 0x40, 0x40, 0x40);
-    data[8] = buildHex(0x40, 0x40, 0x40, 0x40);
-    DYEPALETTE(palette, AColorAvx2)(&data[0], 9);
-    REQUIRE(data[0] == buildHex(0x10, 0x20, 0x30, 0xff));
-    REQUIRE(data[1] == buildHex(0x20, 0x00, 0x00, 0x00));
-    REQUIRE(data[2] == buildHex(0x01, 0x00, 0xee, 0x50));
-    REQUIRE(data[3] == buildHex(0x20, 0x00, 0x00, 0x00));
-    REQUIRE(data[4] == buildHex(0x10, 0x20, 0x30, 0xff));
-    REQUIRE(data[5] == buildHex(0x40, 0x40, 0x41, 0x40));
-    REQUIRE(data[6] == buildHex(0x01, 0x00, 0xee, 0x50));
-    REQUIRE(data[7] == buildHex(0x02, 0x40, 0x40, 0x40));
-    REQUIRE(data[8] == buildHex(0x20, 0x00, 0x00, 0x00));
-}
-
-TEST_CASE("Dye replaceAColor 10 1 avx2", "")
-{
-    DyePalette palette("#40404040,20000000,0100ee40,102030ff", 8);
-    uint32_t data[10];
-    data[0] = buildHex(0x01, 0x00, 0xee, 0x40);
-    data[1] = buildHex(0x40, 0x40, 0x40, 0x40);
-    data[2] = buildHex(0x01, 0x00, 0xee, 0x50);
-    data[3] = buildHex(0x40, 0x40, 0x40, 0x40);
-    data[4] = buildHex(0x01, 0x00, 0xee, 0x40);
-    data[5] = buildHex(0x40, 0x40, 0x41, 0x40);
-    data[6] = buildHex(0x01, 0x00, 0xee, 0x50);
-    data[7] = buildHex(0x02, 0x40, 0x40, 0x40);
-    data[8] = buildHex(0x40, 0x40, 0x40, 0x40);
-    data[9] = buildHex(0x01, 0x00, 0xee, 0x40);
-    DYEPALETTE(palette, AColorAvx2)(&data[0], 10);
-    REQUIRE(data[0] == buildHex(0x10, 0x20, 0x30, 0xff));
-    REQUIRE(data[1] == buildHex(0x20, 0x00, 0x00, 0x00));
-    REQUIRE(data[2] == buildHex(0x01, 0x00, 0xee, 0x50));
-    REQUIRE(data[3] == buildHex(0x20, 0x00, 0x00, 0x00));
-    REQUIRE(data[4] == buildHex(0x10, 0x20, 0x30, 0xff));
-    REQUIRE(data[5] == buildHex(0x40, 0x40, 0x41, 0x40));
-    REQUIRE(data[6] == buildHex(0x01, 0x00, 0xee, 0x50));
-    REQUIRE(data[7] == buildHex(0x02, 0x40, 0x40, 0x40));
-    REQUIRE(data[8] == buildHex(0x20, 0x00, 0x00, 0x00));
-    REQUIRE(data[9] == buildHex(0x10, 0x20, 0x30, 0xff));
-}
-
-
-TEST_CASE("Dye normalDye 1", "")
-{
-    Dye dye("R:#203040,506070");
-    uint32_t data[1];
-    data[0] = buildHex(0x50, 0x00, 0x00, 0x55);
-    dye.normalDye(&data[0], 1);
-    REQUIRE(data[0] == buildHex(0x14, 0x1e, 0x28, 0x55));
-}
-
-TEST_CASE("Dye normalDye 2", "")
-{
-    Dye dye("G:#203040,506070");
-    uint32_t data[1];
-    data[0] = buildHex(0x00, 0x50, 0x00, 0x60);
-    dye.normalDye(&data[0], 1);
-    REQUIRE(data[0] == buildHex(0x14, 0x1e, 0x28, 0x60));
-}
-
-
-#ifdef USE_OPENGL
-TEST_CASE("Dye normalOGLDye 1", "")
-{
-    Dye dye("R:#203040,506070");
-    uint32_t data[1];
-    data[0] = buildHex(0x50, 0x00, 0x00, 0x55);
-    dye.normalOGLDye(&data[0], 1);
-    REQUIRE(data[0] == buildHex(0x50, 0x2a, 0x20, 0x15));
-}
-#endif  // USE_OPENGL
-
-static void dyeCheck(const std::string &dyeString,
-                     const std::string &dstName)
-{
-    const std::string srcName = "arrow_up.png";
-
-    Image *const image1 = Loader::getImage(srcName + dyeString);
-    Image *const image2 = Loader::getImage(dstName);
-    REQUIRE(image1 != nullptr);
-    REQUIRE(image2 != nullptr);
-    SDL_Surface *const surface1 = image1->getSDLSurface();
-    SDL_Surface *const surface2 = image2->getSDLSurface();
-    REQUIRE(surface1 != nullptr);
-    REQUIRE(surface2 != nullptr);
-    REQUIRE(surface1->w == surface2->w);
-    REQUIRE(surface1->h == surface2->h);
-    REQUIRE(surface1->pixels != nullptr);
-    REQUIRE(surface2->pixels != nullptr);
-    const uint32_t *const ptr1 = static_cast<const uint32_t *>(
-        surface1->pixels);
-    const uint32_t *const ptr2 = static_cast<const uint32_t *>(
-        surface2->pixels);
-    const size_t sz = surface1->w * surface1->h;
-    for (size_t idx = 0; idx < sz; idx ++)
-    {
-        REQUIRE(ptr1[idx] == ptr2[idx]);
-    }
-    image2->decRef();
-    image1->decRef();
-}
-
-TEST_CASE("Dye real dye", "")
-{
-    setEnv("SDL_VIDEODRIVER", "dummy");
-
-    client = new Client;
-    SDL_Init(SDL_INIT_VIDEO);
-    VirtFs::mountDirSilent("data", Append_false);
-    VirtFs::mountDirSilent("../data", Append_false);
-    VirtFs::mountDirSilent("data/test", Append_false);
-    VirtFs::mountDirSilent("../data/test", Append_false);
-
-    Dirs::initRootDir();
-    Dirs::initHomeDir();
-
-    setBrandingDefaults(branding);
-    ConfigManager::initConfiguration();
-
-#ifdef USE_SDL2
-    imageHelper = new SurfaceImageHelper;
-
-    SDLImageHelper::setRenderer(graphicsManager.createRenderer(
-        graphicsManager.createWindow(640, 480, 0,
-        SDL_WINDOW_SHOWN | SDL_SWSURFACE), SDL_RENDERER_SOFTWARE));
-#else  // USE_SDL2
-
-    imageHelper = new SDLImageHelper;
-
-    graphicsManager.createWindow(640, 480, 0, SDL_ANYFORMAT | SDL_SWSURFACE);
-#endif  // USE_SDL2
-
-    userPalette = new UserPalette;
-
-    theme = new Theme;
-    Theme::selectSkin();
-
-    ActorSprite::load();
-
-    SECTION("B dye")
-    {
-        dyeCheck("|B:#FFC88A", "arrow_up_B.png");
-    }
-
-    SECTION("S dye")
-    {
-        dyeCheck("|S:#0000FF,FF0000", "arrow_up_S.png");
-    }
-
-    SECTION("A dye")
-    {
-        dyeCheck("|A:#0000FFFF,FF000050", "arrow_up_A.png");
-    }
-
-    delete2(userPalette);
-    delete2(theme);
-    delete2(client);
-    VirtFs::unmountDirSilent("data");
-    VirtFs::unmountDirSilent("../data");
-    VirtFs::unmountDirSilent("data/test");
-    VirtFs::unmountDirSilent("../data/test");
-}
diff --git a/src/unittests/resources/dye/dyepalette.cc b/src/unittests/resources/dye/dyepalette.cc
deleted file mode 100644
index e2632003a..000000000
--- a/src/unittests/resources/dye/dyepalette.cc
+++ /dev/null
@@ -1,400 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2013-2017  The ManaPlus Developers
- *
- *  This file is part of The ManaPlus Client.
- *
- *  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
- *  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, see <http://www.gnu.org/licenses/>.
- */
-
-#include "unittests/unittests.h"
-
-#include "client.h"
-#include "configuration.h"
-#include "configmanager.h"
-#include "dirs.h"
-#include "graphicsmanager.h"
-
-#include "being/actorsprite.h"
-
-#include "fs/virtfs/fs.h"
-
-#include "gui/gui.h"
-#include "gui/theme.h"
-
-#include "render/sdlgraphics.h"
-
-#include "resources/sdlimagehelper.h"
-
-#include "resources/db/palettedb.h"
-
-#include "resources/dye/dyepalette.h"
-
-#include "utils/delete2.h"
-#include "utils/env.h"
-
-PRAGMA48(GCC diagnostic push)
-PRAGMA48(GCC diagnostic ignored "-Wshadow")
-#ifndef USE_SDL2
-#include <SDL.h>
-#endif  // USE_SDL2
-PRAGMA48(GCC diagnostic pop)
-
-#include "debug.h"
-
-TEST_CASE("DyePalette tests", "")
-{
-    setEnv("SDL_VIDEODRIVER", "dummy");
-
-    client = new Client;
-    XML::initXML();
-    SDL_Init(SDL_INIT_VIDEO);
-    VirtFs::mountDirSilent("data", Append_false);
-    VirtFs::mountDirSilent("../data", Append_false);
-    VirtFs::mountDirSilent("data/test", Append_false);
-    VirtFs::mountDirSilent("../data/test", Append_false);
-
-    mainGraphics = new SDLGraphics;
-    imageHelper = new SDLImageHelper();
-
-    Dirs::initRootDir();
-    Dirs::initHomeDir();
-
-    ConfigManager::initConfiguration();
-    setConfigDefaults2(config);
-    setBrandingDefaults(branding);
-
-#ifdef USE_SDL2
-    SDLImageHelper::setRenderer(graphicsManager.createRenderer(
-        graphicsManager.createWindow(640, 480, 0,
-        SDL_WINDOW_SHOWN | SDL_SWSURFACE), SDL_RENDERER_SOFTWARE));
-#else  // USE_SDL2
-
-    graphicsManager.createWindow(640, 480, 0, SDL_ANYFORMAT | SDL_SWSURFACE);
-#endif  // USE_SDL2
-
-    theme = new Theme;
-    Theme::selectSkin();
-
-    ActorSprite::load();
-    gui = new Gui();
-    gui->postInit(mainGraphics);
-    setPathsDefaults(paths);
-    PaletteDB::load();
-
-    SECTION("simple test 1")
-    {
-        DyePalette palette("#12ff34", 6);
-        REQUIRE(palette.mColors.size() == 1);
-        REQUIRE(palette.mColors[0].value[0] == 0x12);
-        REQUIRE(palette.mColors[0].value[1] == 0xff);
-        REQUIRE(palette.mColors[0].value[2] == 0x34);
-        REQUIRE(palette.mColors[0].value[3] == 0x00);
-    }
-
-    SECTION("simple test 2")
-    {
-        DyePalette palette("#12ff3456", 8);
-        REQUIRE(palette.mColors.size() == 1);
-        REQUIRE(palette.mColors[0].value[0] == 0x12);
-        REQUIRE(palette.mColors[0].value[1] == 0xff);
-        REQUIRE(palette.mColors[0].value[2] == 0x34);
-        REQUIRE(palette.mColors[0].value[3] == 0x56);
-    }
-
-    SECTION("simple test 3")
-    {
-        DyePalette palette("#12ff34,002211", 6);
-        REQUIRE(palette.mColors.size() == 2);
-        REQUIRE(palette.mColors[0].value[0] == 0x12);
-        REQUIRE(palette.mColors[0].value[1] == 0xff);
-        REQUIRE(palette.mColors[0].value[2] == 0x34);
-        REQUIRE(palette.mColors[0].value[3] == 0x00);
-
-        REQUIRE(palette.mColors[1].value[0] == 0x00);
-        REQUIRE(palette.mColors[1].value[1] == 0x22);
-        REQUIRE(palette.mColors[1].value[2] == 0x11);
-        REQUIRE(palette.mColors[1].value[3] == 0x00);
-    }
-
-    SECTION("simple test 4")
-    {
-        DyePalette palette("#12ff3412,00221133", 8);
-        REQUIRE(palette.mColors.size() == 2);
-        REQUIRE(palette.mColors[0].value[0] == 0x12);
-        REQUIRE(palette.mColors[0].value[1] == 0xff);
-        REQUIRE(palette.mColors[0].value[2] == 0x34);
-        REQUIRE(palette.mColors[0].value[3] == 0x12);
-
-        REQUIRE(palette.mColors[1].value[0] == 0x00);
-        REQUIRE(palette.mColors[1].value[1] == 0x22);
-        REQUIRE(palette.mColors[1].value[2] == 0x11);
-        REQUIRE(palette.mColors[1].value[3] == 0x33);
-    }
-
-    SECTION("simple test 5")
-    {
-        DyePalette palette("#12ff34,", 6);
-        REQUIRE(palette.mColors.size() == 1);
-        REQUIRE(palette.mColors[0].value[0] == 0x12);
-        REQUIRE(palette.mColors[0].value[1] == 0xff);
-        REQUIRE(palette.mColors[0].value[2] == 0x34);
-        REQUIRE(palette.mColors[0].value[3] == 0x00);
-    }
-
-    SECTION("simple test 6")
-    {
-        DyePalette palette("#12ff3456,", 8);
-        REQUIRE(palette.mColors.size() == 1);
-        REQUIRE(palette.mColors[0].value[0] == 0x12);
-        REQUIRE(palette.mColors[0].value[1] == 0xff);
-        REQUIRE(palette.mColors[0].value[2] == 0x34);
-        REQUIRE(palette.mColors[0].value[3] == 0x56);
-    }
-
-    SECTION("simple test 7")
-    {
-        DyePalette palette("#,,,12ff3412,,00221133", 8);
-        REQUIRE(palette.mColors.size() == 2);
-        REQUIRE(palette.mColors[0].value[0] == 0x12);
-        REQUIRE(palette.mColors[0].value[1] == 0xff);
-        REQUIRE(palette.mColors[0].value[2] == 0x34);
-        REQUIRE(palette.mColors[0].value[3] == 0x12);
-
-        REQUIRE(palette.mColors[1].value[0] == 0x00);
-        REQUIRE(palette.mColors[1].value[1] == 0x22);
-        REQUIRE(palette.mColors[1].value[2] == 0x11);
-        REQUIRE(palette.mColors[1].value[3] == 0x33);
-    }
-
-    SECTION("palette test 1")
-    {
-        DyePalette palette("@Untitled1", 6);
-        REQUIRE(palette.mColors.size() == 1);
-        REQUIRE(palette.mColors[0].value[0] == 47);
-        REQUIRE(palette.mColors[0].value[1] == 56);
-        REQUIRE(palette.mColors[0].value[2] == 46);
-        REQUIRE(palette.mColors[0].value[3] == 255);
-    }
-
-    SECTION("palette test 2")
-    {
-        DyePalette palette("@Untitled1,Untitled8", 6);
-        REQUIRE(palette.mColors.size() == 2);
-        REQUIRE(palette.mColors[0].value[0] == 47);
-        REQUIRE(palette.mColors[0].value[1] == 56);
-        REQUIRE(palette.mColors[0].value[2] == 46);
-        REQUIRE(palette.mColors[0].value[3] == 255);
-
-        REQUIRE(palette.mColors[1].value[0] == 0);
-        REQUIRE(palette.mColors[1].value[1] == 0);
-        REQUIRE(palette.mColors[1].value[2] == 255);
-        REQUIRE(palette.mColors[1].value[3] == 255);
-    }
-
-    SECTION("palette test 3")
-    {
-        DyePalette palette("@Untitled1,", 6);
-        REQUIRE(palette.mColors.size() == 1);
-        REQUIRE(palette.mColors[0].value[0] == 47);
-        REQUIRE(palette.mColors[0].value[1] == 56);
-        REQUIRE(palette.mColors[0].value[2] == 46);
-        REQUIRE(palette.mColors[0].value[3] == 255);
-    }
-
-    SECTION("palette test 4")
-    {
-        DyePalette palette("@,,,Untitled1,,Untitled8", 6);
-        REQUIRE(palette.mColors.size() == 2);
-        REQUIRE(palette.mColors[0].value[0] == 47);
-        REQUIRE(palette.mColors[0].value[1] == 56);
-        REQUIRE(palette.mColors[0].value[2] == 46);
-        REQUIRE(palette.mColors[0].value[3] == 255);
-
-        REQUIRE(palette.mColors[1].value[0] == 0);
-        REQUIRE(palette.mColors[1].value[1] == 0);
-        REQUIRE(palette.mColors[1].value[2] == 255);
-        REQUIRE(palette.mColors[1].value[3] == 255);
-    }
-
-    SECTION("palette test 5")
-    {
-        DyePalette palette("@12ff34", 6);
-        REQUIRE(palette.mColors.size() == 1);
-        REQUIRE(palette.mColors[0].value[0] == 0x12);
-        REQUIRE(palette.mColors[0].value[1] == 0xff);
-        REQUIRE(palette.mColors[0].value[2] == 0x34);
-        REQUIRE(palette.mColors[0].value[3] == 0x00);
-    }
-
-    SECTION("palette test 6")
-    {
-        DyePalette palette("@12ff3456", 8);
-        REQUIRE(palette.mColors.size() == 1);
-        REQUIRE(palette.mColors[0].value[0] == 0x12);
-        REQUIRE(palette.mColors[0].value[1] == 0xff);
-        REQUIRE(palette.mColors[0].value[2] == 0x34);
-        REQUIRE(palette.mColors[0].value[3] == 0x56);
-    }
-
-    SECTION("palette test 7")
-    {
-        DyePalette palette("@12ff34,002211", 6);
-        REQUIRE(palette.mColors.size() == 2);
-        REQUIRE(palette.mColors[0].value[0] == 0x12);
-        REQUIRE(palette.mColors[0].value[1] == 0xff);
-        REQUIRE(palette.mColors[0].value[2] == 0x34);
-        REQUIRE(palette.mColors[0].value[3] == 0x00);
-
-        REQUIRE(palette.mColors[1].value[0] == 0x00);
-        REQUIRE(palette.mColors[1].value[1] == 0x22);
-        REQUIRE(palette.mColors[1].value[2] == 0x11);
-        REQUIRE(palette.mColors[1].value[3] == 0x00);
-    }
-
-    SECTION("palette test 8")
-    {
-        DyePalette palette("@12ff3412,00221133", 8);
-        REQUIRE(palette.mColors.size() == 2);
-        REQUIRE(palette.mColors[0].value[0] == 0x12);
-        REQUIRE(palette.mColors[0].value[1] == 0xff);
-        REQUIRE(palette.mColors[0].value[2] == 0x34);
-        REQUIRE(palette.mColors[0].value[3] == 0x12);
-
-        REQUIRE(palette.mColors[1].value[0] == 0x00);
-        REQUIRE(palette.mColors[1].value[1] == 0x22);
-        REQUIRE(palette.mColors[1].value[2] == 0x11);
-        REQUIRE(palette.mColors[1].value[3] == 0x33);
-    }
-
-    SECTION("palette test 9")
-    {
-        DyePalette palette("@12ff34,", 6);
-        REQUIRE(palette.mColors.size() == 1);
-        REQUIRE(palette.mColors[0].value[0] == 0x12);
-        REQUIRE(palette.mColors[0].value[1] == 0xff);
-        REQUIRE(palette.mColors[0].value[2] == 0x34);
-        REQUIRE(palette.mColors[0].value[3] == 0x00);
-    }
-
-    SECTION("palette test 10")
-    {
-        DyePalette palette("@12ff3456,", 8);
-        REQUIRE(palette.mColors.size() == 1);
-        REQUIRE(palette.mColors[0].value[0] == 0x12);
-        REQUIRE(palette.mColors[0].value[1] == 0xff);
-        REQUIRE(palette.mColors[0].value[2] == 0x34);
-        REQUIRE(palette.mColors[0].value[3] == 0x56);
-    }
-
-    SECTION("palette test 11")
-    {
-        DyePalette palette("@,,,12ff3412,,00221133", 8);
-        REQUIRE(palette.mColors.size() == 2);
-        REQUIRE(palette.mColors[0].value[0] == 0x12);
-        REQUIRE(palette.mColors[0].value[1] == 0xff);
-        REQUIRE(palette.mColors[0].value[2] == 0x34);
-        REQUIRE(palette.mColors[0].value[3] == 0x12);
-
-        REQUIRE(palette.mColors[1].value[0] == 0x00);
-        REQUIRE(palette.mColors[1].value[1] == 0x22);
-        REQUIRE(palette.mColors[1].value[2] == 0x11);
-        REQUIRE(palette.mColors[1].value[3] == 0x33);
-    }
-
-    SECTION("palette test 12")
-    {
-        DyePalette palette("@Untitled1,334455", 6);
-        REQUIRE(palette.mColors.size() == 2);
-        REQUIRE(palette.mColors[0].value[0] == 47);
-        REQUIRE(palette.mColors[0].value[1] == 56);
-        REQUIRE(palette.mColors[0].value[2] == 46);
-        REQUIRE(palette.mColors[0].value[3] == 255);
-
-        REQUIRE(palette.mColors[1].value[0] == 0x33);
-        REQUIRE(palette.mColors[1].value[1] == 0x44);
-        REQUIRE(palette.mColors[1].value[2] == 0x55);
-        REQUIRE(palette.mColors[1].value[3] == 0x00);
-    }
-
-    SECTION("palette test 13")
-    {
-        DyePalette palette("@Untitled1,33445566", 8);
-        REQUIRE(palette.mColors.size() == 2);
-        REQUIRE(palette.mColors[0].value[0] == 47);
-        REQUIRE(palette.mColors[0].value[1] == 56);
-        REQUIRE(palette.mColors[0].value[2] == 46);
-        REQUIRE(palette.mColors[0].value[3] == 255);
-
-        REQUIRE(palette.mColors[1].value[0] == 0x33);
-        REQUIRE(palette.mColors[1].value[1] == 0x44);
-        REQUIRE(palette.mColors[1].value[2] == 0x55);
-        REQUIRE(palette.mColors[1].value[3] == 0x66);
-    }
-
-    SECTION("palette test 14")
-    {
-        DyePalette palette("@+77,Untitled1", 8);
-        REQUIRE(palette.mColors.size() == 1);
-        REQUIRE(palette.mColors[0].value[0] == 47);
-        REQUIRE(palette.mColors[0].value[1] == 56);
-        REQUIRE(palette.mColors[0].value[2] == 46);
-        REQUIRE(palette.mColors[0].value[3] == 0x77);
-    }
-
-    SECTION("palette test 15")
-    {
-        DyePalette palette("@+87,Untitled1,Untitled8", 8);
-        REQUIRE(palette.mColors.size() == 2);
-        REQUIRE(palette.mColors[0].value[0] == 47);
-        REQUIRE(palette.mColors[0].value[1] == 56);
-        REQUIRE(palette.mColors[0].value[2] == 46);
-        REQUIRE(palette.mColors[0].value[3] == 0x87);
-
-        REQUIRE(palette.mColors[1].value[0] == 0);
-        REQUIRE(palette.mColors[1].value[1] == 0);
-        REQUIRE(palette.mColors[1].value[2] == 255);
-        REQUIRE(palette.mColors[1].value[3] == 0x87);
-    }
-
-    SECTION("palette test 16")
-    {
-        DyePalette palette("@+87,Untitled1,+34,Untitled8", 8);
-        REQUIRE(palette.mColors.size() == 2);
-        REQUIRE(palette.mColors[0].value[0] == 47);
-        REQUIRE(palette.mColors[0].value[1] == 56);
-        REQUIRE(palette.mColors[0].value[2] == 46);
-        REQUIRE(palette.mColors[0].value[3] == 0x87);
-
-        REQUIRE(palette.mColors[1].value[0] == 0);
-        REQUIRE(palette.mColors[1].value[1] == 0);
-        REQUIRE(palette.mColors[1].value[2] == 255);
-        REQUIRE(palette.mColors[1].value[3] == 0x34);
-    }
-
-    SECTION("palette test 17")
-    {
-        DyePalette palette("@+12,+23,+77,Untitled1", 8);
-        REQUIRE(palette.mColors.size() == 1);
-        REQUIRE(palette.mColors[0].value[0] == 47);
-        REQUIRE(palette.mColors[0].value[1] == 56);
-        REQUIRE(palette.mColors[0].value[2] == 46);
-        REQUIRE(palette.mColors[0].value[3] == 0x77);
-    }
-    delete2(client);
-    VirtFs::unmountDirSilent("data");
-    VirtFs::unmountDirSilent("../data");
-    VirtFs::unmountDirSilent("data/test");
-    VirtFs::unmountDirSilent("../data/test");
-}
diff --git a/src/unittests/resources/map/maplayer/draw.cc b/src/unittests/resources/map/maplayer/draw.cc
deleted file mode 100644
index 9b946b0c9..000000000
--- a/src/unittests/resources/map/maplayer/draw.cc
+++ /dev/null
@@ -1,580 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2016-2017  The ManaPlus Developers
- *
- *  This file is part of The ManaPlus Client.
- *
- *  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
- *  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, see <http://www.gnu.org/licenses/>.
- */
-
-#include "unittests/unittests.h"
-
-#include "configmanager.h"
-#include "dirs.h"
-
-#include "unittests/render/mockgraphics.h"
-
-#include "resources/image/image.h"
-
-#include "resources/map/map.h"
-#include "resources/map/maplayer.h"
-
-#include "debug.h"
-
-TEST_CASE("MapLayer draw", "")
-{
-    Dirs::initRootDir();
-    Dirs::initHomeDir();
-
-    ConfigManager::initConfiguration();
-
-    Image *const img1 = new Image(32, 32);
-    Image *const img2 = new Image(32, 32);
-    Image *const img3 = new Image(32, 32);
-    Map *map = nullptr;
-    MapLayer *layer = nullptr;
-    MockGraphics *const mock = new MockGraphics;
-
-    SECTION("simple 1")
-    {
-        map = new Map("map",
-            1, 1,
-            32, 32);
-        layer = new MapLayer("test",
-            0, 0,
-            1, 1,
-            false,
-            0,
-            0);
-        layer->setTile(0, 0, img1);
-        map->addLayer(layer);
-        layer->updateCache(1, 1);
-
-        layer->draw(mock,
-            0, 0,
-            1, 1,
-            0, 0);
-        REQUIRE(mock->mDraws.size() == 1);
-        REQUIRE(mock->mDraws[0].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[0].x == 0);
-        REQUIRE(mock->mDraws[0].y == 0);
-        REQUIRE(mock->mDraws[0].image == img1);
-
-        mock->mDraws.clear();
-        layer->draw(mock,
-            0, 0,
-            1, 1,
-            10, 5);
-        REQUIRE(mock->mDraws.size() == 1);
-        REQUIRE(mock->mDraws[0].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[0].x == -10);
-        REQUIRE(mock->mDraws[0].y == -5);
-        REQUIRE(mock->mDraws[0].image == img1);
-
-        mock->mDraws.clear();
-        layer->draw(mock,
-            0, 0,
-            1, 1,
-            -10, -5);
-        REQUIRE(mock->mDraws.size() == 1);
-        REQUIRE(mock->mDraws[0].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[0].x == 10);
-        REQUIRE(mock->mDraws[0].y == 5);
-        REQUIRE(mock->mDraws[0].image == img1);
-    }
-
-    SECTION("simple 2")
-    {
-        map = new Map("map",
-            2, 1,
-            32, 32);
-        layer = new MapLayer("test",
-            0, 0,
-            2, 1,
-            false,
-            0,
-            0);
-        layer->setTile(0, 0, img1);
-        map->addLayer(layer);
-        layer->updateCache(2, 1);
-
-        layer->draw(mock,
-            0, 0,
-            2, 1,
-            0, 0);
-
-        REQUIRE(mock->mDraws.size() == 1);
-        REQUIRE(mock->mDraws[0].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[0].x == 0);
-        REQUIRE(mock->mDraws[0].y == 0);
-        REQUIRE(mock->mDraws[0].image == img1);
-
-        mock->mDraws.clear();
-        layer->draw(mock,
-            0, 0,
-            2, 1,
-            10, 5);
-        REQUIRE(mock->mDraws.size() == 1);
-        REQUIRE(mock->mDraws[0].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[0].x == -10);
-        REQUIRE(mock->mDraws[0].y == -5);
-        REQUIRE(mock->mDraws[0].image == img1);
-
-        mock->mDraws.clear();
-        layer->draw(mock,
-            0, 0,
-            2, 1,
-            -10, -5);
-        REQUIRE(mock->mDraws.size() == 1);
-        REQUIRE(mock->mDraws[0].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[0].x == 10);
-        REQUIRE(mock->mDraws[0].y == 5);
-        REQUIRE(mock->mDraws[0].image == img1);
-    }
-
-    SECTION("simple 3")
-    {
-        map = new Map("map",
-            2, 1,
-            32, 32);
-        layer = new MapLayer("test",
-            0, 0,
-            2, 1,
-            false,
-            0,
-            0);
-        layer->setTile(0, 0, img1);
-        layer->setTile(1, 0, img2);
-        map->addLayer(layer);
-        layer->updateCache(2, 1);
-
-        layer->draw(mock,
-            0, 0,
-            2, 1,
-            0, 0);
-        REQUIRE(mock->mDraws.size() == 2);
-        REQUIRE(mock->mDraws[0].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[0].x == 0);
-        REQUIRE(mock->mDraws[0].y == 0);
-        REQUIRE(mock->mDraws[0].image == img1);
-        REQUIRE(mock->mDraws[1].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[1].x == 32);
-        REQUIRE(mock->mDraws[1].y == 0);
-        REQUIRE(mock->mDraws[1].image == img2);
-
-        mock->mDraws.clear();
-        layer->draw(mock,
-            0, 0,
-            2, 1,
-            -10, -20);
-        REQUIRE(mock->mDraws.size() == 2);
-        REQUIRE(mock->mDraws[0].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[0].x == 10);
-        REQUIRE(mock->mDraws[0].y == 20);
-        REQUIRE(mock->mDraws[0].image == img1);
-        REQUIRE(mock->mDraws[1].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[1].x == 42);
-        REQUIRE(mock->mDraws[1].y == 20);
-        REQUIRE(mock->mDraws[1].image == img2);
-    }
-
-    SECTION("simple 4")
-    {
-        map = new Map("map",
-            2, 1,
-            32, 32);
-        layer = new MapLayer("test",
-            0, 0,
-            2, 1,
-            false,
-            0,
-            0);
-        layer->setTile(0, 0, img1);
-        layer->setTile(1, 0, img1);
-        map->addLayer(layer);
-        layer->updateCache(2, 1);
-
-        layer->draw(mock,
-            0, 0,
-            2, 1,
-            0, 0);
-        REQUIRE(mock->mDraws.size() == 1);
-        REQUIRE(mock->mDraws[0].drawType == MockDrawType::DrawPattern);
-        REQUIRE(mock->mDraws[0].x == 0);
-        REQUIRE(mock->mDraws[0].y == 0);
-        REQUIRE(mock->mDraws[0].width == 64);
-        REQUIRE(mock->mDraws[0].height == 32);
-        REQUIRE(mock->mDraws[0].image == img1);
-
-        mock->mDraws.clear();
-        layer->draw(mock,
-            0, 0,
-            2, 1,
-            -10, 20);
-        REQUIRE(mock->mDraws.size() == 1);
-        REQUIRE(mock->mDraws[0].drawType == MockDrawType::DrawPattern);
-        REQUIRE(mock->mDraws[0].x == 10);
-        REQUIRE(mock->mDraws[0].y == -20);
-        REQUIRE(mock->mDraws[0].width == 64);
-        REQUIRE(mock->mDraws[0].height == 32);
-        REQUIRE(mock->mDraws[0].image == img1);
-    }
-
-    SECTION("simple 4.2")
-    {
-        map = new Map("map",
-            3, 1,
-            32, 32);
-        layer = new MapLayer("test",
-            0, 0,
-            3, 1,
-            false,
-            0,
-            0);
-        layer->setTile(0, 0, img1);
-        layer->setTile(2, 0, img1);
-        map->addLayer(layer);
-        layer->updateCache(3, 1);
-
-        layer->draw(mock,
-            0, 0,
-            3, 1,
-            0, 0);
-        REQUIRE(mock->mDraws.size() == 2);
-        REQUIRE(mock->mDraws[0].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[0].x == 0);
-        REQUIRE(mock->mDraws[0].y == 0);
-        REQUIRE(mock->mDraws[0].image == img1);
-        REQUIRE(mock->mDraws[1].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[1].x == 64);
-        REQUIRE(mock->mDraws[1].y == 0);
-        REQUIRE(mock->mDraws[1].image == img1);
-
-        mock->mDraws.clear();
-        layer->draw(mock,
-            0, 0,
-            3, 1,
-            10, -20);
-        REQUIRE(mock->mDraws.size() == 2);
-        REQUIRE(mock->mDraws[0].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[0].x == -10);
-        REQUIRE(mock->mDraws[0].y == 20);
-        REQUIRE(mock->mDraws[0].image == img1);
-        REQUIRE(mock->mDraws[1].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[1].x == 54);
-        REQUIRE(mock->mDraws[1].y == 20);
-        REQUIRE(mock->mDraws[1].image == img1);
-    }
-
-    SECTION("simple 5")
-    {
-        map = new Map("map",
-            3, 1,
-            32, 32);
-        layer = new MapLayer("test",
-            0, 0,
-            3, 1,
-            false,
-            0,
-            0);
-        layer->setTile(0, 0, img1);
-        layer->setTile(1, 0, img1);
-        map->addLayer(layer);
-        layer->updateCache(3, 1);
-
-        layer->draw(mock,
-            0, 0,
-            3, 1,
-            0, 0);
-        REQUIRE(mock->mDraws.size() == 1);
-        REQUIRE(mock->mDraws[0].drawType == MockDrawType::DrawPattern);
-        REQUIRE(mock->mDraws[0].x == 0);
-        REQUIRE(mock->mDraws[0].y == 0);
-        REQUIRE(mock->mDraws[0].width == 64);
-        REQUIRE(mock->mDraws[0].height == 32);
-        REQUIRE(mock->mDraws[0].image == img1);
-
-        mock->mDraws.clear();
-        layer->draw(mock,
-            0, 0,
-            3, 1,
-            -10, 20);
-        REQUIRE(mock->mDraws.size() == 1);
-        REQUIRE(mock->mDraws[0].drawType == MockDrawType::DrawPattern);
-        REQUIRE(mock->mDraws[0].x == 10);
-        REQUIRE(mock->mDraws[0].y == -20);
-        REQUIRE(mock->mDraws[0].width == 64);
-        REQUIRE(mock->mDraws[0].height == 32);
-        REQUIRE(mock->mDraws[0].image == img1);
-    }
-
-    SECTION("simple 6")
-    {
-        map = new Map("map",
-            3, 1,
-            32, 32);
-        layer = new MapLayer("test",
-            0, 0,
-            3, 1,
-            false,
-            0,
-            0);
-        layer->setTile(0, 0, img1);
-        layer->setTile(1, 0, img1);
-        layer->setTile(2, 0, img2);
-        map->addLayer(layer);
-        layer->updateCache(3, 1);
-
-        layer->draw(mock,
-            0, 0,
-            3, 1,
-            0, 0);
-        REQUIRE(mock->mDraws.size() == 2);
-        REQUIRE(mock->mDraws[0].drawType == MockDrawType::DrawPattern);
-        REQUIRE(mock->mDraws[0].x == 0);
-        REQUIRE(mock->mDraws[0].y == 0);
-        REQUIRE(mock->mDraws[0].width == 64);
-        REQUIRE(mock->mDraws[0].height == 32);
-        REQUIRE(mock->mDraws[0].image == img1);
-        REQUIRE(mock->mDraws[1].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[1].x == 64);
-        REQUIRE(mock->mDraws[1].y == 0);
-        REQUIRE(mock->mDraws[1].image == img2);
-
-        mock->mDraws.clear();
-        layer->draw(mock,
-            0, 0,
-            3, 1,
-            -10, 20);
-        REQUIRE(mock->mDraws.size() == 2);
-        REQUIRE(mock->mDraws[0].drawType == MockDrawType::DrawPattern);
-        REQUIRE(mock->mDraws[0].x == 10);
-        REQUIRE(mock->mDraws[0].y == -20);
-        REQUIRE(mock->mDraws[0].width == 64);
-        REQUIRE(mock->mDraws[0].height == 32);
-        REQUIRE(mock->mDraws[0].image == img1);
-        REQUIRE(mock->mDraws[1].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[1].x == 74);
-        REQUIRE(mock->mDraws[1].y == -20);
-        REQUIRE(mock->mDraws[1].image == img2);
-    }
-
-    SECTION("simple 7")
-    {
-        map = new Map("map",
-            3, 1,
-            32, 32);
-        layer = new MapLayer("test",
-            0, 0,
-            3, 1,
-            false,
-            0,
-            0);
-        layer->setTile(0, 0, img1);
-        layer->setTile(1, 0, img1);
-        layer->setTile(2, 0, img2);
-        map->addLayer(layer);
-        TileInfo *const tiles = layer->getTiles();
-        tiles[0].isEnabled = false;
-        layer->updateCache(3, 1);
-
-        layer->draw(mock,
-            0, 0,
-            3, 1,
-            0, 0);
-        REQUIRE(mock->mDraws.size() == 2);
-        REQUIRE(mock->mDraws[0].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[0].x == 32);
-        REQUIRE(mock->mDraws[0].y == 0);
-        REQUIRE(mock->mDraws[0].image == img1);
-        REQUIRE(mock->mDraws[1].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[1].x == 64);
-        REQUIRE(mock->mDraws[1].y == 0);
-        REQUIRE(mock->mDraws[1].image == img2);
-
-        mock->mDraws.clear();
-        layer->draw(mock,
-            0, 0,
-            3, 1,
-            -10, 20);
-        REQUIRE(mock->mDraws.size() == 2);
-        REQUIRE(mock->mDraws[0].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[0].x == 42);
-        REQUIRE(mock->mDraws[0].y == -20);
-        REQUIRE(mock->mDraws[0].image == img1);
-        REQUIRE(mock->mDraws[1].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[1].x == 74);
-        REQUIRE(mock->mDraws[1].y == -20);
-        REQUIRE(mock->mDraws[1].image == img2);
-    }
-
-    SECTION("normal 1")
-    {
-        const int maxX = 100;
-        const int maxY = 100;
-        map = new Map("map",
-            maxX, maxY,
-            32, 32);
-        layer = new MapLayer("test",
-            0, 0,
-            maxX, maxY,
-            false,
-            0,
-            0);
-        layer->setTile(1, 10, img1);
-        layer->setTile(2, 10, img1);
-        layer->setTile(3, 10, img1);
-        layer->setTile(4, 10, img2);
-        layer->setTile(5, 10, nullptr);
-        layer->setTile(6, 10, img2);
-        layer->setTile(7, 10, nullptr);
-        layer->setTile(8, 10, nullptr);
-        layer->setTile(9, 10, img2);
-        layer->setTile(10, 10, img2);
-        layer->setTile(11, 10, img3);
-        layer->setTile(12, 10, nullptr);
-        layer->setTile(13, 10, nullptr);
-        layer->setTile(14, 10, nullptr);
-        layer->setTile(15, 10, img1);
-        layer->setTile(16, 10, img1);
-        layer->setTile(17, 10, img1);
-        map->addLayer(layer);
-        layer->updateCache(maxX, maxY);
-
-        layer->draw(mock,
-            0, 0,
-            maxX, maxY,
-            0, 0);
-        REQUIRE(mock->mDraws.size() == 6);
-        REQUIRE(mock->mDraws[0].drawType == MockDrawType::DrawPattern);
-        REQUIRE(mock->mDraws[0].x == 32 * 1);
-        REQUIRE(mock->mDraws[0].y == 32 * 10);
-        REQUIRE(mock->mDraws[0].width == 96);
-        REQUIRE(mock->mDraws[0].height == 32);
-        REQUIRE(mock->mDraws[0].image == img1);
-        REQUIRE(mock->mDraws[1].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[1].x == 32 * 4);
-        REQUIRE(mock->mDraws[1].y == 32 * 10);
-        REQUIRE(mock->mDraws[1].image == img2);
-        REQUIRE(mock->mDraws[2].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[2].x == 32 * 6);
-        REQUIRE(mock->mDraws[2].y == 32 * 10);
-        REQUIRE(mock->mDraws[2].image == img2);
-        REQUIRE(mock->mDraws[3].drawType == MockDrawType::DrawPattern);
-        REQUIRE(mock->mDraws[3].x == 32 * 9);
-        REQUIRE(mock->mDraws[3].y == 32 * 10);
-        REQUIRE(mock->mDraws[3].width == 64);
-        REQUIRE(mock->mDraws[3].height == 32);
-        REQUIRE(mock->mDraws[3].image == img2);
-        REQUIRE(mock->mDraws[4].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[4].x == 32 * 11);
-        REQUIRE(mock->mDraws[4].y == 32 * 10);
-        REQUIRE(mock->mDraws[4].image == img3);
-        REQUIRE(mock->mDraws[5].drawType == MockDrawType::DrawPattern);
-        REQUIRE(mock->mDraws[5].x == 32 * 15);
-        REQUIRE(mock->mDraws[5].y == 32 * 10);
-        REQUIRE(mock->mDraws[5].width == 96);
-        REQUIRE(mock->mDraws[5].height == 32);
-        REQUIRE(mock->mDraws[5].image == img1);
-
-        mock->mDraws.clear();
-        layer->draw(mock,
-            0, 0,
-            maxX, maxY,
-            -10, 20);
-        REQUIRE(mock->mDraws.size() == 6);
-        REQUIRE(mock->mDraws[0].drawType == MockDrawType::DrawPattern);
-        REQUIRE(mock->mDraws[0].x == 32 * 1 + 10);
-        REQUIRE(mock->mDraws[0].y == 32 * 10 - 20);
-        REQUIRE(mock->mDraws[0].width == 96);
-        REQUIRE(mock->mDraws[0].height == 32);
-        REQUIRE(mock->mDraws[0].image == img1);
-        REQUIRE(mock->mDraws[1].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[1].x == 32 * 4 + 10);
-        REQUIRE(mock->mDraws[1].y == 32 * 10 - 20);
-        REQUIRE(mock->mDraws[1].image == img2);
-        REQUIRE(mock->mDraws[2].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[2].x == 32 * 6 + 10);
-        REQUIRE(mock->mDraws[2].y == 32 * 10 - 20);
-        REQUIRE(mock->mDraws[2].image == img2);
-        REQUIRE(mock->mDraws[3].drawType == MockDrawType::DrawPattern);
-        REQUIRE(mock->mDraws[3].x == 32 * 9 + 10);
-        REQUIRE(mock->mDraws[3].y == 32 * 10 - 20);
-        REQUIRE(mock->mDraws[3].width == 64);
-        REQUIRE(mock->mDraws[3].height == 32);
-        REQUIRE(mock->mDraws[3].image == img2);
-        REQUIRE(mock->mDraws[4].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[4].x == 32 * 11 + 10);
-        REQUIRE(mock->mDraws[4].y == 32 * 10 - 20);
-        REQUIRE(mock->mDraws[4].image == img3);
-        REQUIRE(mock->mDraws[5].drawType == MockDrawType::DrawPattern);
-        REQUIRE(mock->mDraws[5].x == 32 * 15 + 10);
-        REQUIRE(mock->mDraws[5].y == 32 * 10 - 20);
-        REQUIRE(mock->mDraws[5].width == 96);
-        REQUIRE(mock->mDraws[5].height == 32);
-        REQUIRE(mock->mDraws[5].image == img1);
-    }
-
-    SECTION("normal2")
-    {
-        const int maxX = 100;
-        const int maxY = 100;
-        map = new Map("map",
-            maxX, maxY,
-            32, 32);
-        layer = new MapLayer("test",
-            0, 0,
-            maxX, maxY,
-            false,
-            0,
-            0);
-        TileInfo *const tiles = layer->getTiles();
-        map->addLayer(layer);
-        for (int x = 0; x < maxX; x ++)
-        {
-            for (int y = 0; y < maxY; y ++)
-            {
-                layer->setTile(x, y, img1);
-                tiles[y * maxX + x].isEnabled = false;
-            }
-        }
-        tiles[10 * maxX + 41].isEnabled = true;
-        layer->updateCache(maxX, maxY);
-
-        layer->draw(mock,
-            0, 0,
-            maxX, maxY,
-            0, 0);
-        REQUIRE(mock->mDraws.size() == 1);
-        REQUIRE(mock->mDraws[0].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[0].x == 32 * 41);
-        REQUIRE(mock->mDraws[0].y == 32 * 10);
-
-        mock->mDraws.clear();
-        layer->draw(mock,
-            0, 0,
-            maxX, maxY,
-            -10, 20);
-        REQUIRE(mock->mDraws.size() == 1);
-        REQUIRE(mock->mDraws[0].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[0].x == 32 * 41 + 10);
-        REQUIRE(mock->mDraws[0].y == 32 * 10 - 20);
-    }
-
-    delete map;
-    delete img1;
-    delete img2;
-    delete img3;
-    delete mock;
-}
diff --git a/src/unittests/resources/map/maplayer/drawfringenormal.cc b/src/unittests/resources/map/maplayer/drawfringenormal.cc
deleted file mode 100644
index 372f602b0..000000000
--- a/src/unittests/resources/map/maplayer/drawfringenormal.cc
+++ /dev/null
@@ -1,529 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2016-2017  The ManaPlus Developers
- *
- *  This file is part of The ManaPlus Client.
- *
- *  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
- *  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, see <http://www.gnu.org/licenses/>.
- */
-
-#include "unittests/unittests.h"
-
-#include "configmanager.h"
-#include "configuration.h"
-#include "dirs.h"
-#include "graphicsmanager.h"
-
-#include "being/localplayer.h"
-
-#include "enums/resources/map/mapitemtype.h"
-
-#include "fs/virtfs/fs.h"
-
-#include "gui/theme.h"
-
-#include "unittests/render/mockgraphics.h"
-
-#include "utils/delete2.h"
-#include "utils/env.h"
-
-#include "resources/resourcemanager/resourcemanager.h"
-
-#include "resources/sdlimagehelper.h"
-
-#include "resources/image/image.h"
-
-#include "resources/map/map.h"
-#include "resources/map/maplayer.h"
-#include "resources/map/speciallayer.h"
-
-#include "debug.h"
-
-TEST_CASE("MapLayer drawFringe normal", "")
-{
-    setEnv("SDL_VIDEODRIVER", "dummy");
-
-    VirtFs::mountDirSilent("data", Append_false);
-    VirtFs::mountDirSilent("../data", Append_false);
-
-    imageHelper = new SDLImageHelper;
-
-    Dirs::initRootDir();
-    Dirs::initHomeDir();
-
-    setBrandingDefaults(branding);
-    ConfigManager::initConfiguration();
-
-#ifdef USE_SDL2
-    SDLImageHelper::setRenderer(graphicsManager.createRenderer(
-        graphicsManager.createWindow(640, 480, 0,
-        SDL_WINDOW_SHOWN | SDL_SWSURFACE), SDL_RENDERER_SOFTWARE));
-#else  // USE_SDL2
-
-    graphicsManager.createWindow(640, 480, 0, SDL_ANYFORMAT | SDL_SWSURFACE);
-#endif  // USE_SDL2
-
-    theme = new Theme;
-    Theme::selectSkin();
-
-    localPlayer = new LocalPlayer(static_cast<BeingId>(1),
-        BeingTypeId_zero);
-
-    Image *const img1 = new Image(32, 32);
-    Image *const img2 = new Image(32, 32);
-    Image *const img3 = new Image(32, 32);
-    Map *map = nullptr;
-    MapLayer *layer = nullptr;
-    MockGraphics *const mock = new MockGraphics;
-    const Actors actors;
-
-    SECTION("normal 1")
-    {
-        const int maxX = 100;
-        const int maxY = 100;
-        map = new Map("map",
-            maxX, maxY,
-            32, 32);
-        layer = new MapLayer("test",
-            0, 0,
-            maxX, maxY,
-            true,
-            0,
-            0);
-        layer->setTile(1, 10, img1);
-        layer->setTile(2, 10, img1);
-        layer->setTile(3, 10, img1);
-        layer->setTile(4, 10, img2);
-        layer->setTile(5, 10, nullptr);
-        layer->setTile(6, 10, img2);
-        layer->setTile(7, 10, nullptr);
-        layer->setTile(8, 10, nullptr);
-        layer->setTile(9, 10, img2);
-        layer->setTile(10, 10, img2);
-        layer->setTile(11, 10, img3);
-        layer->setTile(12, 10, nullptr);
-        layer->setTile(13, 10, nullptr);
-        layer->setTile(14, 10, nullptr);
-        layer->setTile(15, 10, img1);
-        layer->setTile(16, 10, img1);
-        layer->setTile(17, 10, img1);
-        map->addLayer(layer);
-        layer->setSpecialLayer(map->getSpecialLayer());
-        layer->setTempLayer(map->getTempLayer());
-        layer->updateCache(maxX, maxY);
-
-        layer->drawFringe(mock,
-            0, 0,
-            maxX, maxY,
-            0, 0,
-            actors);
-        REQUIRE(mock->mDraws.size() == 6);
-        REQUIRE(mock->mDraws[0].drawType == MockDrawType::DrawPattern);
-        REQUIRE(mock->mDraws[0].x == 32 * 1);
-        REQUIRE(mock->mDraws[0].y == 32 * 10);
-        REQUIRE(mock->mDraws[0].width == 96);
-        REQUIRE(mock->mDraws[0].height == 32);
-        REQUIRE(mock->mDraws[0].image == img1);
-        REQUIRE(mock->mDraws[1].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[1].x == 32 * 4);
-        REQUIRE(mock->mDraws[1].y == 32 * 10);
-        REQUIRE(mock->mDraws[1].image == img2);
-        REQUIRE(mock->mDraws[2].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[2].x == 32 * 6);
-        REQUIRE(mock->mDraws[2].y == 32 * 10);
-        REQUIRE(mock->mDraws[2].image == img2);
-        REQUIRE(mock->mDraws[3].drawType == MockDrawType::DrawPattern);
-        REQUIRE(mock->mDraws[3].x == 32 * 9);
-        REQUIRE(mock->mDraws[3].y == 32 * 10);
-        REQUIRE(mock->mDraws[3].width == 64);
-        REQUIRE(mock->mDraws[3].height == 32);
-        REQUIRE(mock->mDraws[3].image == img2);
-        REQUIRE(mock->mDraws[4].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[4].x == 32 * 11);
-        REQUIRE(mock->mDraws[4].y == 32 * 10);
-        REQUIRE(mock->mDraws[4].image == img3);
-        REQUIRE(mock->mDraws[5].drawType == MockDrawType::DrawPattern);
-        REQUIRE(mock->mDraws[5].x == 32 * 15);
-        REQUIRE(mock->mDraws[5].y == 32 * 10);
-        REQUIRE(mock->mDraws[5].width == 96);
-        REQUIRE(mock->mDraws[5].height == 32);
-        REQUIRE(mock->mDraws[5].image == img1);
-
-        mock->mDraws.clear();
-        layer->drawFringe(mock,
-            0, 0,
-            maxX, maxY,
-            -10, 20,
-            actors);
-        REQUIRE(mock->mDraws.size() == 6);
-        REQUIRE(mock->mDraws[0].drawType == MockDrawType::DrawPattern);
-        REQUIRE(mock->mDraws[0].x == 32 * 1 + 10);
-        REQUIRE(mock->mDraws[0].y == 32 * 10 - 20);
-        REQUIRE(mock->mDraws[0].width == 96);
-        REQUIRE(mock->mDraws[0].height == 32);
-        REQUIRE(mock->mDraws[0].image == img1);
-        REQUIRE(mock->mDraws[1].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[1].x == 32 * 4 + 10);
-        REQUIRE(mock->mDraws[1].y == 32 * 10 - 20);
-        REQUIRE(mock->mDraws[1].image == img2);
-        REQUIRE(mock->mDraws[2].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[2].x == 32 * 6 + 10);
-        REQUIRE(mock->mDraws[2].y == 32 * 10 - 20);
-        REQUIRE(mock->mDraws[2].image == img2);
-        REQUIRE(mock->mDraws[3].drawType == MockDrawType::DrawPattern);
-        REQUIRE(mock->mDraws[3].x == 32 * 9 + 10);
-        REQUIRE(mock->mDraws[3].y == 32 * 10 - 20);
-        REQUIRE(mock->mDraws[3].width == 64);
-        REQUIRE(mock->mDraws[3].height == 32);
-        REQUIRE(mock->mDraws[3].image == img2);
-        REQUIRE(mock->mDraws[4].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[4].x == 32 * 11 + 10);
-        REQUIRE(mock->mDraws[4].y == 32 * 10 - 20);
-        REQUIRE(mock->mDraws[4].image == img3);
-        REQUIRE(mock->mDraws[5].drawType == MockDrawType::DrawPattern);
-        REQUIRE(mock->mDraws[5].x == 32 * 15 + 10);
-        REQUIRE(mock->mDraws[5].y == 32 * 10 - 20);
-        REQUIRE(mock->mDraws[5].width == 96);
-        REQUIRE(mock->mDraws[5].height == 32);
-        REQUIRE(mock->mDraws[5].image == img1);
-    }
-
-    SECTION("normal2")
-    {
-        const int maxX = 100;
-        const int maxY = 100;
-        map = new Map("map",
-            maxX, maxY,
-            32, 32);
-        layer = new MapLayer("test",
-            0, 0,
-            maxX, maxY,
-            true,
-            0,
-            0);
-        TileInfo *const tiles = layer->getTiles();
-        map->addLayer(layer);
-        layer->setSpecialLayer(map->getSpecialLayer());
-        layer->setTempLayer(map->getTempLayer());
-        for (int x = 0; x < maxX; x ++)
-        {
-            for (int y = 0; y < maxY; y ++)
-            {
-                layer->setTile(x, y, img1);
-                tiles[y * maxX + x].isEnabled = false;
-            }
-        }
-        tiles[10 * maxX + 41].isEnabled = true;
-        layer->updateCache(maxX, maxY);
-
-        layer->drawFringe(mock,
-            0, 0,
-            maxX, maxY,
-            0, 0,
-            actors);
-        REQUIRE(mock->mDraws.size() == 1);
-        REQUIRE(mock->mDraws[0].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[0].x == 32 * 41);
-        REQUIRE(mock->mDraws[0].y == 32 * 10);
-
-        mock->mDraws.clear();
-        layer->drawFringe(mock,
-            0, 0,
-            maxX, maxY,
-            -10, 20,
-            actors);
-        REQUIRE(mock->mDraws.size() == 1);
-        REQUIRE(mock->mDraws[0].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[0].x == 32 * 41 + 10);
-        REQUIRE(mock->mDraws[0].y == 32 * 10 - 20);
-    }
-
-    SECTION("normal 3")
-    {
-        const int maxX = 100;
-        const int maxY = 100;
-        map = new Map("map",
-            maxX, maxY,
-            32, 32);
-        layer = new MapLayer("test",
-            0, 0,
-            maxX, maxY,
-            true,
-            0,
-            0);
-        layer->setTile(1, 10, img1);
-        layer->setTile(2, 10, img1);
-        layer->setTile(3, 10, img1);
-        layer->setTile(4, 10, img2);
-        layer->setTile(5, 10, nullptr);
-        layer->setTile(6, 10, img2);
-        layer->setTile(7, 10, nullptr);
-        layer->setTile(8, 10, nullptr);
-        layer->setTile(9, 10, img2);
-        layer->setTile(10, 10, img2);
-        layer->setTile(11, 10, img3);
-        layer->setTile(12, 10, nullptr);
-        layer->setTile(13, 10, nullptr);
-        layer->setTile(14, 10, nullptr);
-        layer->setTile(15, 10, img1);
-        layer->setTile(16, 10, img1);
-        layer->setTile(17, 10, img1);
-        map->addLayer(layer);
-        SpecialLayer *const specialLayer = map->getSpecialLayer();
-        SpecialLayer *const tempLayer = map->getTempLayer();
-        layer->setSpecialLayer(specialLayer);
-        layer->setTempLayer(tempLayer);
-        specialLayer->setTile(1, 10, MapItemType::ARROW_UP);
-        specialLayer->setTile(10, 10, MapItemType::ARROW_DOWN);
-        specialLayer->updateCache();
-        layer->updateCache(maxX, maxY);
-
-        layer->drawFringe(mock,
-            0, 0,
-            maxX, maxY,
-            0, 0,
-            actors);
-        REQUIRE(mock->mDraws.size() == 8);
-        REQUIRE(mock->mDraws[0].drawType == MockDrawType::DrawPattern);
-        REQUIRE(mock->mDraws[0].x == 32 * 1);
-        REQUIRE(mock->mDraws[0].y == 32 * 10);
-        REQUIRE(mock->mDraws[0].width == 96);
-        REQUIRE(mock->mDraws[0].height == 32);
-        REQUIRE(mock->mDraws[0].image == img1);
-        REQUIRE(mock->mDraws[1].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[1].x == 32 * 1);
-        REQUIRE(mock->mDraws[1].y == 32 * 10);
-//        REQUIRE(mock->mDraws[1].image == img2);
-        REQUIRE(mock->mDraws[2].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[2].x == 32 * 4);
-        REQUIRE(mock->mDraws[2].y == 32 * 10);
-        REQUIRE(mock->mDraws[2].image == img2);
-        REQUIRE(mock->mDraws[3].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[3].x == 32 * 6);
-        REQUIRE(mock->mDraws[3].y == 32 * 10);
-        REQUIRE(mock->mDraws[3].image == img2);
-        REQUIRE(mock->mDraws[4].drawType == MockDrawType::DrawPattern);
-        REQUIRE(mock->mDraws[4].x == 32 * 9);
-        REQUIRE(mock->mDraws[4].y == 32 * 10);
-        REQUIRE(mock->mDraws[4].width == 64);
-        REQUIRE(mock->mDraws[4].height == 32);
-        REQUIRE(mock->mDraws[4].image == img2);
-        REQUIRE(mock->mDraws[5].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[5].x == 32 * 10);
-        REQUIRE(mock->mDraws[5].y == 32 * 10);
-//        REQUIRE(mock->mDraws[5].image == img2);
-        REQUIRE(mock->mDraws[6].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[6].x == 32 * 11);
-        REQUIRE(mock->mDraws[6].y == 32 * 10);
-        REQUIRE(mock->mDraws[6].image == img3);
-        REQUIRE(mock->mDraws[7].drawType == MockDrawType::DrawPattern);
-        REQUIRE(mock->mDraws[7].x == 32 * 15);
-        REQUIRE(mock->mDraws[7].y == 32 * 10);
-        REQUIRE(mock->mDraws[7].width == 96);
-        REQUIRE(mock->mDraws[7].height == 32);
-        REQUIRE(mock->mDraws[7].image == img1);
-
-        mock->mDraws.clear();
-        layer->drawFringe(mock,
-            0, 0,
-            maxX, maxY,
-            -10, 20,
-            actors);
-        REQUIRE(mock->mDraws.size() == 8);
-        REQUIRE(mock->mDraws[0].drawType == MockDrawType::DrawPattern);
-        REQUIRE(mock->mDraws[0].x == 32 * 1 + 10);
-        REQUIRE(mock->mDraws[0].y == 32 * 10 - 20);
-        REQUIRE(mock->mDraws[0].width == 96);
-        REQUIRE(mock->mDraws[0].height == 32);
-        REQUIRE(mock->mDraws[0].image == img1);
-        REQUIRE(mock->mDraws[1].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[1].x == 32 * 1 + 10);
-        REQUIRE(mock->mDraws[1].y == 32 * 10 - 20);
-//        REQUIRE(mock->mDraws[1].image == img2);
-        REQUIRE(mock->mDraws[2].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[2].x == 32 * 4 + 10);
-        REQUIRE(mock->mDraws[2].y == 32 * 10 - 20);
-        REQUIRE(mock->mDraws[2].image == img2);
-        REQUIRE(mock->mDraws[3].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[3].x == 32 * 6 + 10);
-        REQUIRE(mock->mDraws[3].y == 32 * 10 - 20);
-        REQUIRE(mock->mDraws[3].image == img2);
-        REQUIRE(mock->mDraws[4].drawType == MockDrawType::DrawPattern);
-        REQUIRE(mock->mDraws[4].x == 32 * 9 + 10);
-        REQUIRE(mock->mDraws[4].y == 32 * 10 - 20);
-        REQUIRE(mock->mDraws[4].width == 64);
-        REQUIRE(mock->mDraws[4].height == 32);
-        REQUIRE(mock->mDraws[4].image == img2);
-        REQUIRE(mock->mDraws[5].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[5].x == 32 * 10 + 10);
-        REQUIRE(mock->mDraws[5].y == 32 * 10 - 20);
-//        REQUIRE(mock->mDraws[5].image == img2);
-        REQUIRE(mock->mDraws[6].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[6].x == 32 * 11 + 10);
-        REQUIRE(mock->mDraws[6].y == 32 * 10 - 20);
-        REQUIRE(mock->mDraws[6].image == img3);
-        REQUIRE(mock->mDraws[7].drawType == MockDrawType::DrawPattern);
-        REQUIRE(mock->mDraws[7].x == 32 * 15 + 10);
-        REQUIRE(mock->mDraws[7].y == 32 * 10 - 20);
-        REQUIRE(mock->mDraws[7].width == 96);
-        REQUIRE(mock->mDraws[7].height == 32);
-        REQUIRE(mock->mDraws[7].image == img1);
-    }
-
-    SECTION("normal 4")
-    {
-        const int maxX = 100;
-        const int maxY = 100;
-        map = new Map("map",
-            maxX, maxY,
-            32, 32);
-        layer = new MapLayer("test",
-            0, 0,
-            maxX, maxY,
-            true,
-            0,
-            0);
-        layer->setTile(1, 10, img1);
-        layer->setTile(2, 10, img1);
-        layer->setTile(3, 10, img1);
-        layer->setTile(4, 10, img2);
-        layer->setTile(5, 10, nullptr);
-        layer->setTile(6, 10, img2);
-        layer->setTile(7, 10, nullptr);
-        layer->setTile(8, 10, nullptr);
-        layer->setTile(9, 10, img2);
-        layer->setTile(10, 10, img2);
-        layer->setTile(11, 10, img3);
-        layer->setTile(12, 10, nullptr);
-        layer->setTile(13, 10, nullptr);
-        layer->setTile(14, 10, nullptr);
-        layer->setTile(15, 10, img1);
-        layer->setTile(16, 10, img1);
-        layer->setTile(17, 10, img1);
-        map->addLayer(layer);
-        SpecialLayer *const specialLayer = map->getSpecialLayer();
-        SpecialLayer *const tempLayer = map->getTempLayer();
-        layer->setSpecialLayer(specialLayer);
-        layer->setTempLayer(tempLayer);
-        specialLayer->setTile(0, 10, MapItemType::ARROW_UP);
-        specialLayer->setTile(10, 10, MapItemType::ARROW_DOWN);
-        specialLayer->setTile(90, 10, MapItemType::ARROW_DOWN);
-        specialLayer->updateCache();
-        layer->updateCache(maxX, maxY);
-
-        layer->drawFringe(mock,
-            0, 0,
-            maxX - 20, maxY,
-            0, 0,
-            actors);
-        REQUIRE(mock->mDraws.size() == 8);
-        REQUIRE(mock->mDraws[0].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[0].x == 32 * 0);
-        REQUIRE(mock->mDraws[0].y == 32 * 10);
-//        REQUIRE(mock->mDraws[0].image == img2);
-        REQUIRE(mock->mDraws[1].drawType == MockDrawType::DrawPattern);
-        REQUIRE(mock->mDraws[1].x == 32 * 1);
-        REQUIRE(mock->mDraws[1].y == 32 * 10);
-        REQUIRE(mock->mDraws[1].width == 96);
-        REQUIRE(mock->mDraws[1].height == 32);
-        REQUIRE(mock->mDraws[1].image == img1);
-        REQUIRE(mock->mDraws[2].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[2].x == 32 * 4);
-        REQUIRE(mock->mDraws[2].y == 32 * 10);
-        REQUIRE(mock->mDraws[2].image == img2);
-        REQUIRE(mock->mDraws[3].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[3].x == 32 * 6);
-        REQUIRE(mock->mDraws[3].y == 32 * 10);
-        REQUIRE(mock->mDraws[3].image == img2);
-        REQUIRE(mock->mDraws[4].drawType == MockDrawType::DrawPattern);
-        REQUIRE(mock->mDraws[4].x == 32 * 9);
-        REQUIRE(mock->mDraws[4].y == 32 * 10);
-        REQUIRE(mock->mDraws[4].width == 64);
-        REQUIRE(mock->mDraws[4].height == 32);
-        REQUIRE(mock->mDraws[4].image == img2);
-        REQUIRE(mock->mDraws[5].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[5].x == 32 * 10);
-        REQUIRE(mock->mDraws[5].y == 32 * 10);
-//        REQUIRE(mock->mDraws[5].image == img2);
-        REQUIRE(mock->mDraws[6].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[6].x == 32 * 11);
-        REQUIRE(mock->mDraws[6].y == 32 * 10);
-        REQUIRE(mock->mDraws[6].image == img3);
-        REQUIRE(mock->mDraws[7].drawType == MockDrawType::DrawPattern);
-        REQUIRE(mock->mDraws[7].x == 32 * 15);
-        REQUIRE(mock->mDraws[7].y == 32 * 10);
-        REQUIRE(mock->mDraws[7].width == 96);
-        REQUIRE(mock->mDraws[7].height == 32);
-        REQUIRE(mock->mDraws[7].image == img1);
-
-        mock->mDraws.clear();
-        layer->drawFringe(mock,
-            0, 0,
-            maxX - 20, maxY,
-            -10, 20,
-            actors);
-        REQUIRE(mock->mDraws.size() == 8);
-        REQUIRE(mock->mDraws[0].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[0].x == 32 * 0 + 10);
-        REQUIRE(mock->mDraws[0].y == 32 * 10 - 20);
-//        REQUIRE(mock->mDraws[0].image == img2);
-        REQUIRE(mock->mDraws[1].drawType == MockDrawType::DrawPattern);
-        REQUIRE(mock->mDraws[1].x == 32 * 1 + 10);
-        REQUIRE(mock->mDraws[1].y == 32 * 10 - 20);
-        REQUIRE(mock->mDraws[1].width == 96);
-        REQUIRE(mock->mDraws[1].height == 32);
-        REQUIRE(mock->mDraws[1].image == img1);
-        REQUIRE(mock->mDraws[2].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[2].x == 32 * 4 + 10);
-        REQUIRE(mock->mDraws[2].y == 32 * 10 - 20);
-        REQUIRE(mock->mDraws[2].image == img2);
-        REQUIRE(mock->mDraws[3].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[3].x == 32 * 6 + 10);
-        REQUIRE(mock->mDraws[3].y == 32 * 10 - 20);
-        REQUIRE(mock->mDraws[3].image == img2);
-        REQUIRE(mock->mDraws[4].drawType == MockDrawType::DrawPattern);
-        REQUIRE(mock->mDraws[4].x == 32 * 9 + 10);
-        REQUIRE(mock->mDraws[4].y == 32 * 10 - 20);
-        REQUIRE(mock->mDraws[4].width == 64);
-        REQUIRE(mock->mDraws[4].height == 32);
-        REQUIRE(mock->mDraws[4].image == img2);
-        REQUIRE(mock->mDraws[5].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[5].x == 32 * 10 + 10);
-        REQUIRE(mock->mDraws[5].y == 32 * 10 - 20);
-//        REQUIRE(mock->mDraws[5].image == img2);
-        REQUIRE(mock->mDraws[6].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[6].x == 32 * 11 + 10);
-        REQUIRE(mock->mDraws[6].y == 32 * 10 - 20);
-        REQUIRE(mock->mDraws[6].image == img3);
-        REQUIRE(mock->mDraws[7].drawType == MockDrawType::DrawPattern);
-        REQUIRE(mock->mDraws[7].x == 32 * 15 + 10);
-        REQUIRE(mock->mDraws[7].y == 32 * 10 - 20);
-        REQUIRE(mock->mDraws[7].width == 96);
-        REQUIRE(mock->mDraws[7].height == 32);
-        REQUIRE(mock->mDraws[7].image == img1);
-    }
-
-    delete2(localPlayer);
-    delete map;
-    delete img1;
-    delete img2;
-    delete img3;
-    delete mock;
-    delete2(theme);
-    GraphicsManager::deleteRenderers();
-    ResourceManager::cleanOrphans(true);
-    ResourceManager::deleteInstance();
-    VirtFs::unmountDirSilent("data");
-    VirtFs::unmountDirSilent("../data");
-}
diff --git a/src/unittests/resources/map/maplayer/drawfringesimple.cc b/src/unittests/resources/map/maplayer/drawfringesimple.cc
deleted file mode 100644
index 8773790c7..000000000
--- a/src/unittests/resources/map/maplayer/drawfringesimple.cc
+++ /dev/null
@@ -1,507 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2016-2017  The ManaPlus Developers
- *
- *  This file is part of The ManaPlus Client.
- *
- *  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
- *  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, see <http://www.gnu.org/licenses/>.
- */
-
-#include "unittests/unittests.h"
-
-#include "configmanager.h"
-#include "configuration.h"
-#include "dirs.h"
-#include "graphicsmanager.h"
-
-#include "being/localplayer.h"
-
-#include "fs/virtfs/fs.h"
-
-#include "gui/theme.h"
-
-#include "unittests/render/mockgraphics.h"
-
-#include "utils/delete2.h"
-#include "utils/env.h"
-
-#include "resources/resourcemanager/resourcemanager.h"
-
-#include "resources/sdlimagehelper.h"
-
-#include "resources/image/image.h"
-
-#include "resources/map/map.h"
-#include "resources/map/maplayer.h"
-
-#include "debug.h"
-
-TEST_CASE("MapLayer drawFringe simple", "")
-{
-    setEnv("SDL_VIDEODRIVER", "dummy");
-
-    VirtFs::mountDirSilent("data", Append_false);
-    VirtFs::mountDirSilent("../data", Append_false);
-
-    imageHelper = new SDLImageHelper;
-
-    Dirs::initRootDir();
-    Dirs::initHomeDir();
-
-    setBrandingDefaults(branding);
-    ConfigManager::initConfiguration();
-
-#ifdef USE_SDL2
-    SDLImageHelper::setRenderer(graphicsManager.createRenderer(
-        graphicsManager.createWindow(640, 480, 0,
-        SDL_WINDOW_SHOWN | SDL_SWSURFACE), SDL_RENDERER_SOFTWARE));
-#else  // USE_SDL2
-
-    graphicsManager.createWindow(640, 480, 0, SDL_ANYFORMAT | SDL_SWSURFACE);
-#endif  // USE_SDL2
-
-    theme = new Theme;
-    Theme::selectSkin();
-
-    localPlayer = new LocalPlayer(static_cast<BeingId>(1),
-        BeingTypeId_zero);
-
-    Image *const img1 = new Image(32, 32);
-    Image *const img2 = new Image(32, 32);
-    Image *const img3 = new Image(32, 32);
-    Map *map = nullptr;
-    MapLayer *layer = nullptr;
-    MockGraphics *const mock = new MockGraphics;
-    const Actors actors;
-
-    SECTION("simple 1")
-    {
-        map = new Map("map",
-            1, 1,
-            32, 32);
-        layer = new MapLayer("test",
-            0, 0,
-            1, 1,
-            true,
-            0,
-            0);
-        layer->setTile(0, 0, img1);
-        map->addLayer(layer);
-        layer->setSpecialLayer(map->getSpecialLayer());
-        layer->setTempLayer(map->getTempLayer());
-        layer->updateCache(1, 1);
-
-        layer->drawFringe(mock,
-            0, 0,
-            1, 1,
-            0, 0,
-            actors);
-        REQUIRE(mock->mDraws.size() == 1);
-        REQUIRE(mock->mDraws[0].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[0].x == 0);
-        REQUIRE(mock->mDraws[0].y == 0);
-        REQUIRE(mock->mDraws[0].image == img1);
-
-        mock->mDraws.clear();
-        layer->drawFringe(mock,
-            0, 0,
-            1, 1,
-            10, 5,
-            actors);
-        REQUIRE(mock->mDraws.size() == 1);
-        REQUIRE(mock->mDraws[0].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[0].x == -10);
-        REQUIRE(mock->mDraws[0].y == -5);
-        REQUIRE(mock->mDraws[0].image == img1);
-
-        mock->mDraws.clear();
-        layer->drawFringe(mock,
-            0, 0,
-            1, 1,
-            -10, -5,
-            actors);
-        REQUIRE(mock->mDraws.size() == 1);
-        REQUIRE(mock->mDraws[0].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[0].x == 10);
-        REQUIRE(mock->mDraws[0].y == 5);
-        REQUIRE(mock->mDraws[0].image == img1);
-    }
-
-    SECTION("simple 2")
-    {
-        map = new Map("map",
-            2, 1,
-            32, 32);
-        layer = new MapLayer("test",
-            0, 0,
-            2, 1,
-            true,
-            0,
-            0);
-        layer->setTile(0, 0, img1);
-        map->addLayer(layer);
-        layer->setSpecialLayer(map->getSpecialLayer());
-        layer->setTempLayer(map->getTempLayer());
-        layer->updateCache(2, 1);
-
-        layer->drawFringe(mock,
-            0, 0,
-            2, 1,
-            0, 0,
-            actors);
-
-        REQUIRE(mock->mDraws.size() == 1);
-        REQUIRE(mock->mDraws[0].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[0].x == 0);
-        REQUIRE(mock->mDraws[0].y == 0);
-        REQUIRE(mock->mDraws[0].image == img1);
-
-        mock->mDraws.clear();
-        layer->drawFringe(mock,
-            0, 0,
-            2, 1,
-            10, 5,
-            actors);
-        REQUIRE(mock->mDraws.size() == 1);
-        REQUIRE(mock->mDraws[0].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[0].x == -10);
-        REQUIRE(mock->mDraws[0].y == -5);
-        REQUIRE(mock->mDraws[0].image == img1);
-
-        mock->mDraws.clear();
-        layer->drawFringe(mock,
-            0, 0,
-            2, 1,
-            -10, -5,
-            actors);
-        REQUIRE(mock->mDraws.size() == 1);
-        REQUIRE(mock->mDraws[0].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[0].x == 10);
-        REQUIRE(mock->mDraws[0].y == 5);
-        REQUIRE(mock->mDraws[0].image == img1);
-    }
-
-    SECTION("simple 3")
-    {
-        map = new Map("map",
-            2, 1,
-            32, 32);
-        layer = new MapLayer("test",
-            0, 0,
-            2, 1,
-            true,
-            0,
-            0);
-        layer->setTile(0, 0, img1);
-        layer->setTile(1, 0, img2);
-        map->addLayer(layer);
-        layer->setSpecialLayer(map->getSpecialLayer());
-        layer->setTempLayer(map->getTempLayer());
-        layer->updateCache(2, 1);
-
-        layer->drawFringe(mock,
-            0, 0,
-            2, 1,
-            0, 0,
-            actors);
-        REQUIRE(mock->mDraws.size() == 2);
-        REQUIRE(mock->mDraws[0].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[0].x == 0);
-        REQUIRE(mock->mDraws[0].y == 0);
-        REQUIRE(mock->mDraws[0].image == img1);
-        REQUIRE(mock->mDraws[1].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[1].x == 32);
-        REQUIRE(mock->mDraws[1].y == 0);
-        REQUIRE(mock->mDraws[1].image == img2);
-
-        mock->mDraws.clear();
-        layer->drawFringe(mock,
-            0, 0,
-            2, 1,
-            -10, -20,
-            actors);
-        REQUIRE(mock->mDraws.size() == 2);
-        REQUIRE(mock->mDraws[0].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[0].x == 10);
-        REQUIRE(mock->mDraws[0].y == 20);
-        REQUIRE(mock->mDraws[0].image == img1);
-        REQUIRE(mock->mDraws[1].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[1].x == 42);
-        REQUIRE(mock->mDraws[1].y == 20);
-        REQUIRE(mock->mDraws[1].image == img2);
-    }
-
-    SECTION("simple 4")
-    {
-        map = new Map("map",
-            2, 1,
-            32, 32);
-        layer = new MapLayer("test",
-            0, 0,
-            2, 1,
-            true,
-            0,
-            0);
-        layer->setTile(0, 0, img1);
-        layer->setTile(1, 0, img1);
-        map->addLayer(layer);
-        layer->setSpecialLayer(map->getSpecialLayer());
-        layer->setTempLayer(map->getTempLayer());
-        layer->updateCache(2, 1);
-
-        layer->drawFringe(mock,
-            0, 0,
-            2, 1,
-            0, 0,
-            actors);
-        REQUIRE(mock->mDraws.size() == 1);
-        REQUIRE(mock->mDraws[0].drawType == MockDrawType::DrawPattern);
-        REQUIRE(mock->mDraws[0].x == 0);
-        REQUIRE(mock->mDraws[0].y == 0);
-        REQUIRE(mock->mDraws[0].width == 64);
-        REQUIRE(mock->mDraws[0].height == 32);
-        REQUIRE(mock->mDraws[0].image == img1);
-
-        mock->mDraws.clear();
-        layer->drawFringe(mock,
-            0, 0,
-            2, 1,
-            -10, 20,
-            actors);
-        REQUIRE(mock->mDraws.size() == 1);
-        REQUIRE(mock->mDraws[0].drawType == MockDrawType::DrawPattern);
-        REQUIRE(mock->mDraws[0].x == 10);
-        REQUIRE(mock->mDraws[0].y == -20);
-        REQUIRE(mock->mDraws[0].width == 64);
-        REQUIRE(mock->mDraws[0].height == 32);
-        REQUIRE(mock->mDraws[0].image == img1);
-    }
-
-    SECTION("simple 4.2")
-    {
-        map = new Map("map",
-            3, 1,
-            32, 32);
-        layer = new MapLayer("test",
-            0, 0,
-            3, 1,
-            true,
-            0,
-            0);
-        layer->setTile(0, 0, img1);
-        layer->setTile(2, 0, img1);
-        map->addLayer(layer);
-        layer->setSpecialLayer(map->getSpecialLayer());
-        layer->setTempLayer(map->getTempLayer());
-        layer->updateCache(3, 1);
-
-        layer->drawFringe(mock,
-            0, 0,
-            3, 1,
-            0, 0,
-            actors);
-        REQUIRE(mock->mDraws.size() == 2);
-        REQUIRE(mock->mDraws[0].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[0].x == 0);
-        REQUIRE(mock->mDraws[0].y == 0);
-        REQUIRE(mock->mDraws[0].image == img1);
-        REQUIRE(mock->mDraws[1].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[1].x == 64);
-        REQUIRE(mock->mDraws[1].y == 0);
-        REQUIRE(mock->mDraws[1].image == img1);
-
-        mock->mDraws.clear();
-        layer->drawFringe(mock,
-            0, 0,
-            3, 1,
-            10, -20,
-            actors);
-        REQUIRE(mock->mDraws.size() == 2);
-        REQUIRE(mock->mDraws[0].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[0].x == -10);
-        REQUIRE(mock->mDraws[0].y == 20);
-        REQUIRE(mock->mDraws[0].image == img1);
-        REQUIRE(mock->mDraws[1].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[1].x == 54);
-        REQUIRE(mock->mDraws[1].y == 20);
-        REQUIRE(mock->mDraws[1].image == img1);
-    }
-
-    SECTION("simple 5")
-    {
-        map = new Map("map",
-            3, 1,
-            32, 32);
-        layer = new MapLayer("test",
-            0, 0,
-            3, 1,
-            true,
-            0,
-            0);
-        layer->setTile(0, 0, img1);
-        layer->setTile(1, 0, img1);
-        map->addLayer(layer);
-        layer->setSpecialLayer(map->getSpecialLayer());
-        layer->setTempLayer(map->getTempLayer());
-        layer->updateCache(3, 1);
-
-        layer->drawFringe(mock,
-            0, 0,
-            3, 1,
-            0, 0,
-            actors);
-        REQUIRE(mock->mDraws.size() == 1);
-        REQUIRE(mock->mDraws[0].drawType == MockDrawType::DrawPattern);
-        REQUIRE(mock->mDraws[0].x == 0);
-        REQUIRE(mock->mDraws[0].y == 0);
-        REQUIRE(mock->mDraws[0].width == 64);
-        REQUIRE(mock->mDraws[0].height == 32);
-        REQUIRE(mock->mDraws[0].image == img1);
-
-        mock->mDraws.clear();
-        layer->drawFringe(mock,
-            0, 0,
-            3, 1,
-            -10, 20,
-            actors);
-        REQUIRE(mock->mDraws.size() == 1);
-        REQUIRE(mock->mDraws[0].drawType == MockDrawType::DrawPattern);
-        REQUIRE(mock->mDraws[0].x == 10);
-        REQUIRE(mock->mDraws[0].y == -20);
-        REQUIRE(mock->mDraws[0].width == 64);
-        REQUIRE(mock->mDraws[0].height == 32);
-        REQUIRE(mock->mDraws[0].image == img1);
-    }
-
-    SECTION("simple 6")
-    {
-        map = new Map("map",
-            3, 1,
-            32, 32);
-        layer = new MapLayer("test",
-            0, 0,
-            3, 1,
-            true,
-            0,
-            0);
-        layer->setTile(0, 0, img1);
-        layer->setTile(1, 0, img1);
-        layer->setTile(2, 0, img2);
-        map->addLayer(layer);
-        layer->setSpecialLayer(map->getSpecialLayer());
-        layer->setTempLayer(map->getTempLayer());
-        layer->updateCache(3, 1);
-
-        layer->drawFringe(mock,
-            0, 0,
-            3, 1,
-            0, 0,
-            actors);
-        REQUIRE(mock->mDraws.size() == 2);
-        REQUIRE(mock->mDraws[0].drawType == MockDrawType::DrawPattern);
-        REQUIRE(mock->mDraws[0].x == 0);
-        REQUIRE(mock->mDraws[0].y == 0);
-        REQUIRE(mock->mDraws[0].width == 64);
-        REQUIRE(mock->mDraws[0].height == 32);
-        REQUIRE(mock->mDraws[0].image == img1);
-        REQUIRE(mock->mDraws[1].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[1].x == 64);
-        REQUIRE(mock->mDraws[1].y == 0);
-        REQUIRE(mock->mDraws[1].image == img2);
-
-        mock->mDraws.clear();
-        layer->drawFringe(mock,
-            0, 0,
-            3, 1,
-            -10, 20,
-            actors);
-        REQUIRE(mock->mDraws.size() == 2);
-        REQUIRE(mock->mDraws[0].drawType == MockDrawType::DrawPattern);
-        REQUIRE(mock->mDraws[0].x == 10);
-        REQUIRE(mock->mDraws[0].y == -20);
-        REQUIRE(mock->mDraws[0].width == 64);
-        REQUIRE(mock->mDraws[0].height == 32);
-        REQUIRE(mock->mDraws[0].image == img1);
-        REQUIRE(mock->mDraws[1].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[1].x == 74);
-        REQUIRE(mock->mDraws[1].y == -20);
-        REQUIRE(mock->mDraws[1].image == img2);
-    }
-
-    SECTION("simple 7")
-    {
-        map = new Map("map",
-            3, 1,
-            32, 32);
-        layer = new MapLayer("test",
-            0, 0,
-            3, 1,
-            true,
-            0,
-            0);
-        layer->setTile(0, 0, img1);
-        layer->setTile(1, 0, img1);
-        layer->setTile(2, 0, img2);
-        map->addLayer(layer);
-        layer->setSpecialLayer(map->getSpecialLayer());
-        layer->setTempLayer(map->getTempLayer());
-        TileInfo *const tiles = layer->getTiles();
-        tiles[0].isEnabled = false;
-        layer->updateCache(3, 1);
-
-        layer->drawFringe(mock,
-            0, 0,
-            3, 1,
-            0, 0,
-            actors);
-        REQUIRE(mock->mDraws.size() == 2);
-        REQUIRE(mock->mDraws[0].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[0].x == 32);
-        REQUIRE(mock->mDraws[0].y == 0);
-        REQUIRE(mock->mDraws[0].image == img1);
-        REQUIRE(mock->mDraws[1].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[1].x == 64);
-        REQUIRE(mock->mDraws[1].y == 0);
-        REQUIRE(mock->mDraws[1].image == img2);
-
-        mock->mDraws.clear();
-        layer->drawFringe(mock,
-            0, 0,
-            3, 1,
-            -10, 20,
-            actors);
-        REQUIRE(mock->mDraws.size() == 2);
-        REQUIRE(mock->mDraws[0].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[0].x == 42);
-        REQUIRE(mock->mDraws[0].y == -20);
-        REQUIRE(mock->mDraws[0].image == img1);
-        REQUIRE(mock->mDraws[1].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[1].x == 74);
-        REQUIRE(mock->mDraws[1].y == -20);
-        REQUIRE(mock->mDraws[1].image == img2);
-    }
-
-    delete2(localPlayer);
-    delete map;
-    delete img1;
-    delete img2;
-    delete img3;
-    delete mock;
-    delete2(theme);
-    GraphicsManager::deleteRenderers();
-    ResourceManager::cleanOrphans(true);
-    ResourceManager::deleteInstance();
-    VirtFs::unmountDirSilent("data");
-    VirtFs::unmountDirSilent("../data");
-}
diff --git a/src/unittests/resources/map/maplayer/drawspeciallayer1.cc b/src/unittests/resources/map/maplayer/drawspeciallayer1.cc
deleted file mode 100644
index c9dd51f1d..000000000
--- a/src/unittests/resources/map/maplayer/drawspeciallayer1.cc
+++ /dev/null
@@ -1,396 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2016-2017  The ManaPlus Developers
- *
- *  This file is part of The ManaPlus Client.
- *
- *  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
- *  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, see <http://www.gnu.org/licenses/>.
- */
-
-#include "unittests/unittests.h"
-
-#include "configmanager.h"
-#include "configuration.h"
-#include "dirs.h"
-#include "graphicsmanager.h"
-
-#include "enums/resources/map/mapitemtype.h"
-
-#include "fs/virtfs/fs.h"
-
-#include "unittests/render/mockgraphics.h"
-
-#include "utils/env.h"
-
-#include "resources/resourcemanager/resourcemanager.h"
-
-#include "resources/sdlimagehelper.h"
-
-#include "resources/map/map.h"
-#include "resources/map/maplayer.h"
-#include "resources/map/speciallayer.h"
-
-#include "debug.h"
-
-TEST_CASE("MapLayer drawSpecialLayer (specialLayer)", "")
-{
-    setEnv("SDL_VIDEODRIVER", "dummy");
-
-    VirtFs::mountDirSilent("data", Append_false);
-    VirtFs::mountDirSilent("../data", Append_false);
-
-    imageHelper = new SDLImageHelper;
-
-    Dirs::initRootDir();
-    Dirs::initHomeDir();
-
-    setBrandingDefaults(branding);
-    ConfigManager::initConfiguration();
-
-#ifdef USE_SDL2
-    SDLImageHelper::setRenderer(graphicsManager.createRenderer(
-        graphicsManager.createWindow(640, 480, 0,
-        SDL_WINDOW_SHOWN | SDL_SWSURFACE), SDL_RENDERER_SOFTWARE));
-#else  // USE_SDL2
-
-    graphicsManager.createWindow(640, 480, 0, SDL_ANYFORMAT | SDL_SWSURFACE);
-#endif  // USE_SDL2
-
-    Map *map = nullptr;
-    MapLayer *layer = nullptr;
-    SpecialLayer *specialLayer = nullptr;
-    MockGraphics *const mock = new MockGraphics;
-    const Actors actors;
-
-    SECTION("simple 1")
-    {
-        map = new Map("map",
-            1, 1,
-            32, 32);
-        layer = new MapLayer("test",
-            0, 0,
-            1, 1,
-            true,
-            0,
-            0);
-        map->addLayer(layer);
-        layer->setSpecialLayer(map->getSpecialLayer());
-        layer->setTempLayer(map->getTempLayer());
-        specialLayer = map->getSpecialLayer();
-
-        layer->drawSpecialLayer(mock,
-            0,
-            0, 1,
-            0, 0);
-        REQUIRE(mock->mDraws.empty());
-
-        specialLayer->setTile(0, 0, MapItemType::ARROW_UP);
-        layer->drawSpecialLayer(mock,
-            0,
-            0, 1,
-            0, 0);
-//        REQUIRE(mock->mDraws.size() == 1);
-    }
-
-    SECTION("simple 2")
-    {
-        map = new Map("map",
-            1, 1,
-            32, 32);
-        layer = new MapLayer("test",
-            0, 0,
-            1, 1,
-            true,
-            0,
-            0);
-        map->addLayer(layer);
-        layer->setSpecialLayer(map->getSpecialLayer());
-        layer->setTempLayer(map->getTempLayer());
-        specialLayer = map->getSpecialLayer();
-        specialLayer->setTile(0, 0, MapItemType::ARROW_UP);
-        specialLayer->updateCache();
-
-        layer->drawSpecialLayer(mock,
-            0,
-            0, 1,
-            0, 0);
-        REQUIRE(mock->mDraws.size() == 1);
-        REQUIRE(mock->mDraws[0].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[0].x == 0);
-        REQUIRE(mock->mDraws[0].y == 0);
-    }
-
-    SECTION("simple 3")
-    {
-        map = new Map("map",
-            2, 1,
-            32, 32);
-        layer = new MapLayer("test",
-            0, 0,
-            2, 1,
-            true,
-            0,
-            0);
-        map->addLayer(layer);
-        layer->setSpecialLayer(map->getSpecialLayer());
-        layer->setTempLayer(map->getTempLayer());
-        specialLayer = map->getSpecialLayer();
-        specialLayer->setTile(0, 0, MapItemType::ARROW_UP);
-        specialLayer->updateCache();
-
-        layer->drawSpecialLayer(mock,
-            0,
-            0, 2,
-            0, 0);
-        REQUIRE(mock->mDraws.size() == 1);
-        REQUIRE(mock->mDraws[0].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[0].x == 0);
-        REQUIRE(mock->mDraws[0].y == 0);
-    }
-
-    SECTION("simple 4")
-    {
-        map = new Map("map",
-            2, 1,
-            32, 32);
-        layer = new MapLayer("test",
-            0, 0,
-            2, 1,
-            true,
-            0,
-            0);
-        map->addLayer(layer);
-        layer->setSpecialLayer(map->getSpecialLayer());
-        layer->setTempLayer(map->getTempLayer());
-        specialLayer = map->getSpecialLayer();
-        specialLayer->setTile(1, 0, MapItemType::ARROW_UP);
-        specialLayer->updateCache();
-
-        layer->drawSpecialLayer(mock,
-            0,
-            0, 2,
-            0, 0);
-        REQUIRE(mock->mDraws.size() == 1);
-        REQUIRE(mock->mDraws[0].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[0].x == 32);
-        REQUIRE(mock->mDraws[0].y == 0);
-    }
-
-    SECTION("simple 5")
-    {
-        map = new Map("map",
-            2, 1,
-            32, 32);
-        layer = new MapLayer("test",
-            0, 0,
-            2, 1,
-            true,
-            0,
-            0);
-        map->addLayer(layer);
-        layer->setSpecialLayer(map->getSpecialLayer());
-        layer->setTempLayer(map->getTempLayer());
-        specialLayer = map->getSpecialLayer();
-        specialLayer->setTile(0, 0, MapItemType::ARROW_UP);
-        specialLayer->setTile(1, 0, MapItemType::ARROW_UP);
-        specialLayer->updateCache();
-
-        layer->drawSpecialLayer(mock,
-            0,
-            0, 2,
-            0, 0);
-        REQUIRE(mock->mDraws.size() == 2);
-        REQUIRE(mock->mDraws[0].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[0].x == 0);
-        REQUIRE(mock->mDraws[0].y == 0);
-        REQUIRE(mock->mDraws[1].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[1].x == 32);
-        REQUIRE(mock->mDraws[1].y == 0);
-    }
-
-    SECTION("simple 6")
-    {
-        map = new Map("map",
-            3, 1,
-            32, 32);
-        layer = new MapLayer("test",
-            0, 0,
-            3, 1,
-            true,
-            0,
-            0);
-        map->addLayer(layer);
-        layer->setSpecialLayer(map->getSpecialLayer());
-        layer->setTempLayer(map->getTempLayer());
-        specialLayer = map->getSpecialLayer();
-        specialLayer->setTile(0, 0, MapItemType::ARROW_UP);
-        specialLayer->setTile(2, 0, MapItemType::ARROW_UP);
-        specialLayer->updateCache();
-
-        layer->drawSpecialLayer(mock,
-            0,
-            0, 3,
-            0, 0);
-        REQUIRE(mock->mDraws.size() == 2);
-        REQUIRE(mock->mDraws[0].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[0].x == 0);
-        REQUIRE(mock->mDraws[0].y == 0);
-        REQUIRE(mock->mDraws[1].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[1].x == 64);
-        REQUIRE(mock->mDraws[1].y == 0);
-    }
-
-    SECTION("simple 7")
-    {
-        map = new Map("map",
-            3, 1,
-            32, 32);
-        layer = new MapLayer("test",
-            0, 0,
-            3, 1,
-            true,
-            0,
-            0);
-        map->addLayer(layer);
-        layer->setSpecialLayer(map->getSpecialLayer());
-        layer->setTempLayer(map->getTempLayer());
-        specialLayer = map->getSpecialLayer();
-        specialLayer->setTile(1, 0, MapItemType::ARROW_UP);
-        specialLayer->setTile(2, 0, MapItemType::ARROW_UP);
-        specialLayer->updateCache();
-
-        layer->drawSpecialLayer(mock,
-            0,
-            0, 3,
-            0, 0);
-        REQUIRE(mock->mDraws.size() == 2);
-        REQUIRE(mock->mDraws[0].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[0].x == 32);
-        REQUIRE(mock->mDraws[0].y == 0);
-        REQUIRE(mock->mDraws[1].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[1].x == 64);
-        REQUIRE(mock->mDraws[1].y == 0);
-    }
-
-    SECTION("simple 8")
-    {
-        map = new Map("map",
-            3, 1,
-            32, 32);
-        layer = new MapLayer("test",
-            0, 0,
-            3, 1,
-            true,
-            0,
-            0);
-        map->addLayer(layer);
-        layer->setSpecialLayer(map->getSpecialLayer());
-        layer->setTempLayer(map->getTempLayer());
-        specialLayer = map->getSpecialLayer();
-        specialLayer->setTile(0, 0, MapItemType::ARROW_UP);
-        specialLayer->setTile(1, 0, MapItemType::ARROW_DOWN);
-        specialLayer->setTile(2, 0, MapItemType::ARROW_UP);
-        specialLayer->updateCache();
-
-        layer->drawSpecialLayer(mock,
-            0,
-            0, 3,
-            0, 0);
-        REQUIRE(mock->mDraws.size() == 3);
-        REQUIRE(mock->mDraws[0].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[0].x == 0);
-        REQUIRE(mock->mDraws[0].y == 0);
-        REQUIRE(mock->mDraws[1].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[1].x == 32);
-        REQUIRE(mock->mDraws[1].y == 0);
-        REQUIRE(mock->mDraws[2].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[2].x == 64);
-        REQUIRE(mock->mDraws[2].y == 0);
-    }
-
-    SECTION("normal 1")
-    {
-        const int maxX = 100;
-        const int maxY = 50;
-        map = new Map("map",
-            maxX, maxY,
-            32, 32);
-        layer = new MapLayer("test",
-            0, 0,
-            maxX, maxY,
-            true,
-            0,
-            0);
-        map->addLayer(layer);
-        layer->setSpecialLayer(map->getSpecialLayer());
-        layer->setTempLayer(map->getTempLayer());
-        specialLayer = map->getSpecialLayer();
-        specialLayer->setTile(0, 5, MapItemType::ARROW_UP);
-        specialLayer->setTile(1, 5, MapItemType::ARROW_DOWN);
-        specialLayer->setTile(2, 5, MapItemType::ARROW_UP);
-        specialLayer->setTile(3, 5, MapItemType::EMPTY);
-        specialLayer->setTile(4, 5, MapItemType::EMPTY);
-        specialLayer->setTile(6, 5, MapItemType::ARROW_LEFT);
-        specialLayer->setTile(10, 20, MapItemType::ARROW_LEFT);
-        specialLayer->updateCache();
-
-        layer->drawSpecialLayer(mock,
-            5,
-            0, maxX,
-            0, 0);
-        REQUIRE(mock->mDraws.size() == 4);
-        REQUIRE(mock->mDraws[0].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[0].x == 0 * 32);
-        REQUIRE(mock->mDraws[0].y == 5 * 32);
-        REQUIRE(mock->mDraws[1].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[1].x == 1 * 32);
-        REQUIRE(mock->mDraws[1].y == 5 * 32);
-        REQUIRE(mock->mDraws[2].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[2].x == 2 * 32);
-        REQUIRE(mock->mDraws[2].y == 5 * 32);
-        REQUIRE(mock->mDraws[3].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[3].x == 6 * 32);
-        REQUIRE(mock->mDraws[3].y == 5 * 32);
-
-        mock->mDraws.clear();
-        layer->drawSpecialLayer(mock,
-            4,
-            0, maxX,
-            0, 0);
-        REQUIRE(mock->mDraws.empty());
-
-        layer->drawSpecialLayer(mock,
-            6,
-            0, maxX,
-            0, 0);
-        REQUIRE(mock->mDraws.empty());
-
-        layer->drawSpecialLayer(mock,
-            20,
-            0, maxX,
-            0, 0);
-        REQUIRE(mock->mDraws.size() == 1);
-        REQUIRE(mock->mDraws[0].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[0].x == 10 * 32);
-        REQUIRE(mock->mDraws[0].y == 20 * 32);
-    }
-
-    delete map;
-    delete mock;
-    GraphicsManager::deleteRenderers();
-    ResourceManager::cleanOrphans(true);
-    ResourceManager::deleteInstance();
-    VirtFs::unmountDirSilent("data");
-    VirtFs::unmountDirSilent("../data");
-}
diff --git a/src/unittests/resources/map/maplayer/drawspeciallayer2.cc b/src/unittests/resources/map/maplayer/drawspeciallayer2.cc
deleted file mode 100644
index e4e414a0d..000000000
--- a/src/unittests/resources/map/maplayer/drawspeciallayer2.cc
+++ /dev/null
@@ -1,402 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2016-2017  The ManaPlus Developers
- *
- *  This file is part of The ManaPlus Client.
- *
- *  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
- *  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, see <http://www.gnu.org/licenses/>.
- */
-
-#include "unittests/unittests.h"
-
-#include "configmanager.h"
-#include "configuration.h"
-#include "dirs.h"
-#include "graphicsmanager.h"
-
-#include "enums/resources/map/mapitemtype.h"
-
-#include "fs/virtfs/fs.h"
-
-#include "unittests/render/mockgraphics.h"
-
-#include "utils/env.h"
-
-#include "resources/resourcemanager/resourcemanager.h"
-
-#include "resources/sdlimagehelper.h"
-
-#include "resources/map/map.h"
-#include "resources/map/maplayer.h"
-#include "resources/map/speciallayer.h"
-
-#include "debug.h"
-
-TEST_CASE("MapLayer drawSpecialLayer (tempLayer)", "")
-{
-    setEnv("SDL_VIDEODRIVER", "dummy");
-
-    VirtFs::mountDirSilent("data", Append_false);
-    VirtFs::mountDirSilent("../data", Append_false);
-
-    imageHelper = new SDLImageHelper;
-
-    Dirs::initRootDir();
-    Dirs::initHomeDir();
-
-    setBrandingDefaults(branding);
-    ConfigManager::initConfiguration();
-
-#ifdef USE_SDL2
-    SDLImageHelper::setRenderer(graphicsManager.createRenderer(
-        graphicsManager.createWindow(640, 480, 0,
-        SDL_WINDOW_SHOWN | SDL_SWSURFACE), SDL_RENDERER_SOFTWARE));
-#else  // USE_SDL2
-
-    graphicsManager.createWindow(640, 480, 0, SDL_ANYFORMAT | SDL_SWSURFACE);
-#endif  // USE_SDL2
-
-    Map *map = nullptr;
-    MapLayer *layer = nullptr;
-    SpecialLayer *specialLayer = nullptr;
-    MockGraphics *const mock = new MockGraphics;
-    const Actors actors;
-
-    SECTION("simple 1")
-    {
-        map = new Map("map",
-            1, 1,
-            32, 32);
-        layer = new MapLayer("test",
-            0, 0,
-            1, 1,
-            true,
-            0,
-            0);
-        map->addLayer(layer);
-        layer->setSpecialLayer(map->getSpecialLayer());
-        layer->setTempLayer(map->getTempLayer());
-        specialLayer = map->getTempLayer();
-
-        layer->drawSpecialLayer(mock,
-            0,
-            0, 1,
-            0, 0);
-        REQUIRE(mock->mDraws.empty());
-
-        specialLayer->setTile(0, 0, MapItemType::ARROW_UP);
-        layer->drawSpecialLayer(mock,
-            0,
-            0, 1,
-            0, 0);
-//        REQUIRE(mock->mDraws.size() == 1);
-    }
-
-    SECTION("simple 2")
-    {
-        map = new Map("map",
-            1, 1,
-            32, 32);
-        layer = new MapLayer("test",
-            0, 0,
-            1, 1,
-            true,
-            0,
-            0);
-        map->addLayer(layer);
-        layer->setSpecialLayer(map->getSpecialLayer());
-        layer->setTempLayer(map->getTempLayer());
-        specialLayer = map->getTempLayer();
-        specialLayer->setTile(0, 0, MapItemType::ARROW_UP);
-        specialLayer->updateCache();
-
-        layer->drawSpecialLayer(mock,
-            0,
-            0, 1,
-            0, 0);
-        REQUIRE(mock->mDraws.size() == 1);
-        REQUIRE(mock->mDraws[0].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[0].x == 0);
-        REQUIRE(mock->mDraws[0].y == 0);
-    }
-
-    SECTION("simple 3")
-    {
-        map = new Map("map",
-            2, 1,
-            32, 32);
-        layer = new MapLayer("test",
-            0, 0,
-            2, 1,
-            true,
-            0,
-            0);
-        map->addLayer(layer);
-        layer->setSpecialLayer(map->getSpecialLayer());
-        layer->setTempLayer(map->getTempLayer());
-        specialLayer = map->getTempLayer();
-        specialLayer->setTile(0, 0, MapItemType::ARROW_UP);
-        specialLayer->updateCache();
-
-        layer->drawSpecialLayer(mock,
-            0,
-            0, 2,
-            0, 0);
-        REQUIRE(mock->mDraws.size() == 1);
-        REQUIRE(mock->mDraws[0].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[0].x == 0);
-        REQUIRE(mock->mDraws[0].y == 0);
-    }
-
-    SECTION("simple 4")
-    {
-        map = new Map("map",
-            2, 1,
-            32, 32);
-        layer = new MapLayer("test",
-            0, 0,
-            2, 1,
-            true,
-            0,
-            0);
-        map->addLayer(layer);
-        layer->setSpecialLayer(map->getSpecialLayer());
-        layer->setTempLayer(map->getTempLayer());
-        specialLayer = map->getTempLayer();
-        const int *const cache = specialLayer->getCache();
-        REQUIRE(cache[0] == 10000);
-        REQUIRE(cache[1] == 10000);
-
-        specialLayer->setTile(1, 0, MapItemType::ARROW_UP);
-        specialLayer->updateCache();
-        REQUIRE(cache[0] == 0);
-        REQUIRE(cache[1] == 10000);
-
-        layer->drawSpecialLayer(mock,
-            0,
-            0, 2,
-            0, 0);
-        REQUIRE(mock->mDraws.size() == 1);
-        REQUIRE(mock->mDraws[0].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[0].x == 32);
-        REQUIRE(mock->mDraws[0].y == 0);
-    }
-
-    SECTION("simple 5")
-    {
-        map = new Map("map",
-            2, 1,
-            32, 32);
-        layer = new MapLayer("test",
-            0, 0,
-            2, 1,
-            true,
-            0,
-            0);
-        map->addLayer(layer);
-        layer->setSpecialLayer(map->getSpecialLayer());
-        layer->setTempLayer(map->getTempLayer());
-        specialLayer = map->getTempLayer();
-        specialLayer->setTile(0, 0, MapItemType::ARROW_UP);
-        specialLayer->setTile(1, 0, MapItemType::ARROW_UP);
-        specialLayer->updateCache();
-
-        layer->drawSpecialLayer(mock,
-            0,
-            0, 2,
-            0, 0);
-        REQUIRE(mock->mDraws.size() == 2);
-        REQUIRE(mock->mDraws[0].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[0].x == 0);
-        REQUIRE(mock->mDraws[0].y == 0);
-        REQUIRE(mock->mDraws[1].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[1].x == 32);
-        REQUIRE(mock->mDraws[1].y == 0);
-    }
-
-    SECTION("simple 6")
-    {
-        map = new Map("map",
-            3, 1,
-            32, 32);
-        layer = new MapLayer("test",
-            0, 0,
-            3, 1,
-            true,
-            0,
-            0);
-        map->addLayer(layer);
-        layer->setSpecialLayer(map->getSpecialLayer());
-        layer->setTempLayer(map->getTempLayer());
-        specialLayer = map->getTempLayer();
-        specialLayer->setTile(0, 0, MapItemType::ARROW_UP);
-        specialLayer->setTile(2, 0, MapItemType::ARROW_UP);
-        specialLayer->updateCache();
-
-        layer->drawSpecialLayer(mock,
-            0,
-            0, 3,
-            0, 0);
-        REQUIRE(mock->mDraws.size() == 2);
-        REQUIRE(mock->mDraws[0].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[0].x == 0);
-        REQUIRE(mock->mDraws[0].y == 0);
-        REQUIRE(mock->mDraws[1].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[1].x == 64);
-        REQUIRE(mock->mDraws[1].y == 0);
-    }
-
-    SECTION("simple 7")
-    {
-        map = new Map("map",
-            3, 1,
-            32, 32);
-        layer = new MapLayer("test",
-            0, 0,
-            3, 1,
-            true,
-            0,
-            0);
-        map->addLayer(layer);
-        layer->setSpecialLayer(map->getSpecialLayer());
-        layer->setTempLayer(map->getTempLayer());
-        specialLayer = map->getTempLayer();
-        specialLayer->setTile(1, 0, MapItemType::ARROW_UP);
-        specialLayer->setTile(2, 0, MapItemType::ARROW_UP);
-        specialLayer->updateCache();
-
-        layer->drawSpecialLayer(mock,
-            0,
-            0, 3,
-            0, 0);
-        REQUIRE(mock->mDraws.size() == 2);
-        REQUIRE(mock->mDraws[0].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[0].x == 32);
-        REQUIRE(mock->mDraws[0].y == 0);
-        REQUIRE(mock->mDraws[1].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[1].x == 64);
-        REQUIRE(mock->mDraws[1].y == 0);
-    }
-
-    SECTION("simple 8")
-    {
-        map = new Map("map",
-            3, 1,
-            32, 32);
-        layer = new MapLayer("test",
-            0, 0,
-            3, 1,
-            true,
-            0,
-            0);
-        map->addLayer(layer);
-        layer->setSpecialLayer(map->getSpecialLayer());
-        layer->setTempLayer(map->getTempLayer());
-        specialLayer = map->getTempLayer();
-        specialLayer->setTile(0, 0, MapItemType::ARROW_UP);
-        specialLayer->setTile(1, 0, MapItemType::ARROW_DOWN);
-        specialLayer->setTile(2, 0, MapItemType::ARROW_UP);
-        specialLayer->updateCache();
-
-        layer->drawSpecialLayer(mock,
-            0,
-            0, 3,
-            0, 0);
-        REQUIRE(mock->mDraws.size() == 3);
-        REQUIRE(mock->mDraws[0].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[0].x == 0);
-        REQUIRE(mock->mDraws[0].y == 0);
-        REQUIRE(mock->mDraws[1].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[1].x == 32);
-        REQUIRE(mock->mDraws[1].y == 0);
-        REQUIRE(mock->mDraws[2].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[2].x == 64);
-        REQUIRE(mock->mDraws[2].y == 0);
-    }
-
-    SECTION("normal 1")
-    {
-        const int maxX = 100;
-        const int maxY = 50;
-        map = new Map("map",
-            maxX, maxY,
-            32, 32);
-        layer = new MapLayer("test",
-            0, 0,
-            maxX, maxY,
-            true,
-            0,
-            0);
-        map->addLayer(layer);
-        layer->setSpecialLayer(map->getSpecialLayer());
-        layer->setTempLayer(map->getTempLayer());
-        specialLayer = map->getTempLayer();
-        specialLayer->setTile(0, 5, MapItemType::ARROW_UP);
-        specialLayer->setTile(1, 5, MapItemType::ARROW_DOWN);
-        specialLayer->setTile(2, 5, MapItemType::ARROW_UP);
-        specialLayer->setTile(3, 5, MapItemType::EMPTY);
-        specialLayer->setTile(4, 5, MapItemType::EMPTY);
-        specialLayer->setTile(6, 5, MapItemType::ARROW_LEFT);
-        specialLayer->setTile(10, 20, MapItemType::ARROW_LEFT);
-        specialLayer->updateCache();
-
-        layer->drawSpecialLayer(mock,
-            5,
-            0, maxX,
-            0, 0);
-        REQUIRE(mock->mDraws.size() == 4);
-        REQUIRE(mock->mDraws[0].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[0].x == 0 * 32);
-        REQUIRE(mock->mDraws[0].y == 5 * 32);
-        REQUIRE(mock->mDraws[1].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[1].x == 1 * 32);
-        REQUIRE(mock->mDraws[1].y == 5 * 32);
-        REQUIRE(mock->mDraws[2].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[2].x == 2 * 32);
-        REQUIRE(mock->mDraws[2].y == 5 * 32);
-        REQUIRE(mock->mDraws[3].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[3].x == 6 * 32);
-        REQUIRE(mock->mDraws[3].y == 5 * 32);
-
-        mock->mDraws.clear();
-        layer->drawSpecialLayer(mock,
-            4,
-            0, maxX,
-            0, 0);
-        REQUIRE(mock->mDraws.empty());
-
-        layer->drawSpecialLayer(mock,
-            6,
-            0, maxX,
-            0, 0);
-        REQUIRE(mock->mDraws.empty());
-
-        layer->drawSpecialLayer(mock,
-            20,
-            0, maxX,
-            0, 0);
-        REQUIRE(mock->mDraws.size() == 1);
-        REQUIRE(mock->mDraws[0].drawType == MockDrawType::DrawImage);
-        REQUIRE(mock->mDraws[0].x == 10 * 32);
-        REQUIRE(mock->mDraws[0].y == 20 * 32);
-    }
-
-    delete map;
-    delete mock;
-    GraphicsManager::deleteRenderers();
-    ResourceManager::cleanOrphans(true);
-    ResourceManager::deleteInstance();
-    VirtFs::unmountDirSilent("data");
-    VirtFs::unmountDirSilent("../data");
-}
diff --git a/src/unittests/resources/map/maplayer/getemptytiledrawwidth.cc b/src/unittests/resources/map/maplayer/getemptytiledrawwidth.cc
deleted file mode 100644
index a5378ce86..000000000
--- a/src/unittests/resources/map/maplayer/getemptytiledrawwidth.cc
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2016-2017  The ManaPlus Developers
- *
- *  This file is part of The ManaPlus Client.
- *
- *  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
- *  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, see <http://www.gnu.org/licenses/>.
- */
-
-#include "unittests/unittests.h"
-
-#include "configmanager.h"
-#include "dirs.h"
-
-#include "resources/image/image.h"
-
-#include "resources/map/maplayer.h"
-
-#include "debug.h"
-
-TEST_CASE("MapLayer getEmptyTileDrawWidth", "")
-{
-    Dirs::initRootDir();
-    Dirs::initHomeDir();
-
-    ConfigManager::initConfiguration();
-
-    Image *const img1 = new Image(32, 32);
-    Image *const img2 = new Image(32, 32);
-    Image *const img3 = new Image(32, 32);
-    MapLayer *layer = nullptr;
-    int nextTile;
-
-    SECTION("simple 2")
-    {
-        layer = new MapLayer("test",
-            0, 0,
-            2, 1,
-            false,
-            0,
-            0);
-        layer->setTile(0, 0, img1);
-        TileInfo *const tiles = layer->getTiles();
-        REQUIRE(layer->getEmptyTileDrawWidth(tiles + 1,
-            1,
-            nextTile) == 0);
-        REQUIRE(nextTile == 0);
-    }
-
-    SECTION("simple 4")
-    {
-        layer = new MapLayer("test",
-            0, 0,
-            3, 1,
-            false,
-            0,
-            0);
-        layer->setTile(0, 0, img1);
-        layer->setTile(2, 0, img1);
-        TileInfo *const tiles = layer->getTiles();
-        REQUIRE(layer->getEmptyTileDrawWidth(tiles + 1,
-            2,
-            nextTile) == 0);
-        REQUIRE(nextTile == 0);
-    }
-
-    SECTION("simple 5")
-    {
-        layer = new MapLayer("test",
-            0, 0,
-            3, 1,
-            false,
-            0,
-            0);
-        layer->setTile(0, 0, img1);
-        layer->setTile(1, 0, img1);
-        TileInfo *const tiles = layer->getTiles();
-        REQUIRE(layer->getEmptyTileDrawWidth(tiles + 2,
-            1,
-            nextTile) == 0);
-        REQUIRE(nextTile == 0);
-    }
-
-    SECTION("normal 1")
-    {
-        layer = new MapLayer("test",
-            0, 0,
-            100, 100,
-            false,
-            0,
-            0);
-        layer->setTile(1, 10, img1);
-        layer->setTile(2, 10, img1);
-        layer->setTile(3, 10, img1);
-        layer->setTile(4, 10, img2);
-        layer->setTile(5, 10, nullptr);
-        layer->setTile(6, 10, img2);
-        layer->setTile(7, 10, nullptr);
-        layer->setTile(8, 10, nullptr);
-        layer->setTile(9, 10, img2);
-        layer->setTile(10, 10, img2);
-        layer->setTile(11, 10, img3);
-        layer->setTile(12, 10, nullptr);
-        layer->setTile(13, 10, nullptr);
-        layer->setTile(14, 10, nullptr);
-        layer->setTile(15, 10, img1);
-        layer->setTile(16, 10, img1);
-        layer->setTile(17, 10, img1);
-        TileInfo *const tiles = layer->getTiles();
-
-        REQUIRE(layer->getEmptyTileDrawWidth(tiles + 10 * 100 + 0,
-            100 - 0,
-            nextTile) == 0);
-        REQUIRE(nextTile == 0);
-
-        REQUIRE(layer->getEmptyTileDrawWidth(tiles + 10 * 100 + 5,
-            100 - 5,
-            nextTile) == 0);
-        REQUIRE(nextTile == 0);
-
-        REQUIRE(layer->getEmptyTileDrawWidth(tiles + 10 * 100 + 7,
-            100 - 7,
-            nextTile) == 1);
-        REQUIRE(nextTile == 1);
-
-        REQUIRE(layer->getEmptyTileDrawWidth(tiles + 10 * 100 + 8,
-            100 - 8,
-            nextTile) == 0);
-        REQUIRE(nextTile == 0);
-
-        REQUIRE(layer->getEmptyTileDrawWidth(tiles + 10 * 100 + 12,
-            100 - 12,
-            nextTile) == 2);
-        REQUIRE(nextTile == 2);
-
-        REQUIRE(layer->getEmptyTileDrawWidth(tiles + 10 * 100 + 13,
-            100 - 13,
-            nextTile) == 1);
-        REQUIRE(nextTile == 1);
-
-        REQUIRE(layer->getEmptyTileDrawWidth(tiles + 10 * 100 + 14,
-            100 - 14,
-            nextTile) == 0);
-        REQUIRE(nextTile == 0);
-    }
-
-    delete layer;
-    delete img1;
-    delete img2;
-    delete img3;
-}
diff --git a/src/unittests/resources/map/maplayer/gettiledrawwidth.cc b/src/unittests/resources/map/maplayer/gettiledrawwidth.cc
deleted file mode 100644
index 121e14530..000000000
--- a/src/unittests/resources/map/maplayer/gettiledrawwidth.cc
+++ /dev/null
@@ -1,399 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2016-2017  The ManaPlus Developers
- *
- *  This file is part of The ManaPlus Client.
- *
- *  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
- *  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, see <http://www.gnu.org/licenses/>.
- */
-
-#include "unittests/unittests.h"
-
-#include "configmanager.h"
-#include "dirs.h"
-
-#include "resources/image/image.h"
-
-#include "resources/map/maplayer.h"
-
-#include "debug.h"
-
-TEST_CASE("MapLayer getTileDrawWidth", "")
-{
-    Dirs::initRootDir();
-    Dirs::initHomeDir();
-
-    ConfigManager::initConfiguration();
-
-    Image *const img1 = new Image(32, 32);
-    Image *const img2 = new Image(32, 32);
-    Image *const img3 = new Image(32, 32);
-    MapLayer *layer = nullptr;
-    int width;
-    int nextTile;
-
-    SECTION("simple 1")
-    {
-        layer = new MapLayer("test",
-            0, 0,
-            1, 1,
-            false,
-            0,
-            0);
-        layer->setTile(0, 0, img1);
-        TileInfo *const tiles = layer->getTiles();
-        REQUIRE(layer->getTileDrawWidth(tiles,
-            1,
-            width,
-            nextTile) == 0);
-        REQUIRE(width == 32);
-        REQUIRE(nextTile == 0);
-    }
-
-    SECTION("simple 2")
-    {
-        layer = new MapLayer("test",
-            0, 0,
-            2, 1,
-            false,
-            0,
-            0);
-        layer->setTile(0, 0, img1);
-        TileInfo *const tiles = layer->getTiles();
-        REQUIRE(layer->getTileDrawWidth(tiles,
-            2,
-            width,
-            nextTile) == 0);
-        REQUIRE(width == 32);
-        REQUIRE(nextTile == 1);
-    }
-
-    SECTION("simple 3")
-    {
-        layer = new MapLayer("test",
-            0, 0,
-            2, 1,
-            false,
-            0,
-            0);
-        layer->setTile(0, 0, img1);
-        layer->setTile(1, 0, img2);
-        TileInfo *const tiles = layer->getTiles();
-        REQUIRE(layer->getTileDrawWidth(tiles,
-            1,
-            width,
-            nextTile) == 0);
-        REQUIRE(width == 32);
-        REQUIRE(nextTile == 0);
-
-        REQUIRE(layer->getTileDrawWidth(tiles + 1,
-            1,
-            width,
-            nextTile) == 0);
-        REQUIRE(width == 32);
-        REQUIRE(nextTile == 0);
-    }
-
-    SECTION("simple 4")
-    {
-        layer = new MapLayer("test",
-            0, 0,
-            2, 1,
-            false,
-            0,
-            0);
-        layer->setTile(0, 0, img1);
-        layer->setTile(1, 0, img1);
-        TileInfo *const tiles = layer->getTiles();
-        REQUIRE(layer->getTileDrawWidth(tiles,
-            2,
-            width,
-            nextTile) == 1);
-        REQUIRE(width == 64);
-        REQUIRE(nextTile == 1);
-
-        REQUIRE(layer->getTileDrawWidth(tiles + 1,
-            1,
-            width,
-            nextTile) == 0);
-        REQUIRE(width == 32);
-        REQUIRE(nextTile == 0);
-    }
-
-    SECTION("simple 4.2")
-    {
-        layer = new MapLayer("test",
-            0, 0,
-            3, 1,
-            false,
-            0,
-            0);
-        layer->setTile(0, 0, img1);
-        layer->setTile(2, 0, img1);
-        TileInfo *const tiles = layer->getTiles();
-        REQUIRE(layer->getTileDrawWidth(tiles,
-            3,
-            width,
-            nextTile) == 0);
-        REQUIRE(width == 32);
-        REQUIRE(nextTile == 1);
-
-        REQUIRE(layer->getTileDrawWidth(tiles + 2,
-            1,
-            width,
-            nextTile) == 0);
-        REQUIRE(width == 32);
-        REQUIRE(nextTile == 0);
-    }
-
-    SECTION("simple 5")
-    {
-        layer = new MapLayer("test",
-            0, 0,
-            3, 1,
-            false,
-            0,
-            0);
-        layer->setTile(0, 0, img1);
-        layer->setTile(1, 0, img1);
-        TileInfo *const tiles = layer->getTiles();
-        REQUIRE(layer->getTileDrawWidth(tiles,
-            3,
-            width,
-            nextTile) == 1);
-        REQUIRE(width == 64);
-        REQUIRE(nextTile == 2);
-
-        REQUIRE(layer->getTileDrawWidth(tiles + 1,
-            2,
-            width,
-            nextTile) == 0);
-        REQUIRE(width == 32);
-        REQUIRE(nextTile == 1);
-    }
-
-    SECTION("simple 6")
-    {
-        layer = new MapLayer("test",
-            0, 0,
-            3, 1,
-            false,
-            0,
-            0);
-        layer->setTile(0, 0, img1);
-        layer->setTile(1, 0, img1);
-        layer->setTile(2, 0, img2);
-        TileInfo *const tiles = layer->getTiles();
-        REQUIRE(layer->getTileDrawWidth(tiles,
-            3,
-            width,
-            nextTile) == 1);
-        REQUIRE(width == 64);
-        REQUIRE(nextTile == 1);
-
-        REQUIRE(layer->getTileDrawWidth(tiles + 1,
-            2,
-            width,
-            nextTile) == 0);
-        REQUIRE(width == 32);
-        REQUIRE(nextTile == 0);
-
-        REQUIRE(layer->getTileDrawWidth(tiles + 2,
-            1,
-            width,
-            nextTile) == 0);
-        REQUIRE(width == 32);
-        REQUIRE(nextTile == 0);
-    }
-
-    SECTION("simple 7")
-    {
-        layer = new MapLayer("test",
-            0, 0,
-            3, 1,
-            false,
-            0,
-            0);
-        layer->setTile(0, 0, img1);
-        layer->setTile(1, 0, img1);
-        layer->setTile(2, 0, img2);
-        TileInfo *const tiles = layer->getTiles();
-        tiles[1].isEnabled = false;
-        REQUIRE(layer->getTileDrawWidth(tiles,
-            3,
-            width,
-            nextTile) == 0);
-        REQUIRE(width == 32);
-        REQUIRE(nextTile == 1);
-
-//        REQUIRE(layer->getTileDrawWidth(tiles + 1,
-//            2,
-//            width,
-//            nextTile) == 0);
-//        REQUIRE(width == 32);
-//        REQUIRE(nextTile == 0);
-
-        REQUIRE(layer->getTileDrawWidth(tiles + 2,
-            1,
-            width,
-            nextTile) == 0);
-        REQUIRE(width == 32);
-        REQUIRE(nextTile == 0);
-    }
-
-    SECTION("simple 8")
-    {
-        layer = new MapLayer("test",
-            0, 0,
-            3, 1,
-            false,
-            0,
-            0);
-        layer->setTile(0, 0, img1);
-        layer->setTile(1, 0, img1);
-        layer->setTile(2, 0, img2);
-        TileInfo *const tiles = layer->getTiles();
-        tiles[0].isEnabled = false;
-//        REQUIRE(layer->getTileDrawWidth(tiles,
-//            3,
-//            width,
-//            nextTile) == 1);
-//        REQUIRE(width == 0);
-//        REQUIRE(nextTile == 1);
-
-        REQUIRE(layer->getTileDrawWidth(tiles + 1,
-            2,
-            width,
-            nextTile) == 0);
-        REQUIRE(width == 32);
-        REQUIRE(nextTile == 0);
-
-        REQUIRE(layer->getTileDrawWidth(tiles + 2,
-            1,
-            width,
-            nextTile) == 0);
-        REQUIRE(width == 32);
-        REQUIRE(nextTile == 0);
-    }
-
-    SECTION("normal 1")
-    {
-        layer = new MapLayer("test",
-            0, 0,
-            100, 100,
-            false,
-            0,
-            0);
-        layer->setTile(1, 10, img1);
-        layer->setTile(2, 10, img1);
-        layer->setTile(3, 10, img1);
-        layer->setTile(4, 10, img2);
-        layer->setTile(5, 10, nullptr);
-        layer->setTile(6, 10, img2);
-        layer->setTile(7, 10, nullptr);
-        layer->setTile(8, 10, nullptr);
-        layer->setTile(9, 10, img2);
-        layer->setTile(10, 10, img2);
-        layer->setTile(11, 10, img3);
-        layer->setTile(12, 10, nullptr);
-        layer->setTile(13, 10, nullptr);
-        layer->setTile(14, 10, nullptr);
-        layer->setTile(15, 10, img1);
-        layer->setTile(16, 10, img1);
-        layer->setTile(17, 10, img1);
-        TileInfo *const tiles = layer->getTiles();
-
-        REQUIRE(layer->getTileDrawWidth(tiles + 10 * 100 + 1,
-            100 - 1,
-            width,
-            nextTile) == 2);
-        REQUIRE(width == 96);
-        REQUIRE(nextTile == 2);
-
-        REQUIRE(layer->getTileDrawWidth(tiles + 10 * 100 + 2,
-            100 - 2,
-            width,
-            nextTile) == 1);
-        REQUIRE(width == 64);
-        REQUIRE(nextTile == 1);
-
-        REQUIRE(layer->getTileDrawWidth(tiles + 10 * 100 + 3,
-            100 - 3,
-            width,
-            nextTile) == 0);
-        REQUIRE(width == 32);
-        REQUIRE(nextTile == 0);
-
-        REQUIRE(layer->getTileDrawWidth(tiles + 10 * 100 + 4,
-            100 - 4,
-            width,
-            nextTile) == 0);
-        REQUIRE(width == 32);
-        REQUIRE(nextTile == 1);
-
-        REQUIRE(layer->getTileDrawWidth(tiles + 10 * 100 + 6,
-            100 - 6,
-            width,
-            nextTile) == 0);
-        REQUIRE(width == 32);
-        REQUIRE(nextTile == 2);
-
-        REQUIRE(layer->getTileDrawWidth(tiles + 10 * 100 + 9,
-            100 - 9,
-            width,
-            nextTile) == 1);
-        REQUIRE(width == 64);
-        REQUIRE(nextTile == 1);
-
-        REQUIRE(layer->getTileDrawWidth(tiles + 10 * 100 + 10,
-            100 - 10,
-            width,
-            nextTile) == 0);
-        REQUIRE(width == 32);
-        REQUIRE(nextTile == 0);
-
-        REQUIRE(layer->getTileDrawWidth(tiles + 10 * 100 + 11,
-            100 - 11,
-            width,
-            nextTile) == 0);
-        REQUIRE(width == 32);
-        REQUIRE(nextTile == 3);
-
-        REQUIRE(layer->getTileDrawWidth(tiles + 10 * 100 + 15,
-            100 - 15,
-            width,
-            nextTile) == 2);
-        REQUIRE(width == 96);
-        REQUIRE(nextTile == 84);
-
-        REQUIRE(layer->getTileDrawWidth(tiles + 10 * 100 + 16,
-            100 - 16,
-            width,
-            nextTile) == 1);
-        REQUIRE(width == 64);
-        REQUIRE(nextTile == 83);
-
-        REQUIRE(layer->getTileDrawWidth(tiles + 10 * 100 + 17,
-            100 - 17,
-            width,
-            nextTile) == 0);
-        REQUIRE(width == 32);
-        REQUIRE(nextTile == 82);
-    }
-
-    delete layer;
-    delete img1;
-    delete img2;
-    delete img3;
-}
diff --git a/src/unittests/resources/map/maplayer/updatecache.cc b/src/unittests/resources/map/maplayer/updatecache.cc
deleted file mode 100644
index eaff5ac5d..000000000
--- a/src/unittests/resources/map/maplayer/updatecache.cc
+++ /dev/null
@@ -1,399 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2016-2017  The ManaPlus Developers
- *
- *  This file is part of The ManaPlus Client.
- *
- *  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
- *  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, see <http://www.gnu.org/licenses/>.
- */
-
-#include "unittests/unittests.h"
-
-#include "configmanager.h"
-#include "dirs.h"
-
-#include "resources/image/image.h"
-
-#include "resources/map/maplayer.h"
-
-#include "debug.h"
-
-TEST_CASE("MapLayer updateCache", "")
-{
-    Dirs::initRootDir();
-    Dirs::initHomeDir();
-
-    ConfigManager::initConfiguration();
-
-    Image *const img1 = new Image(32, 32);
-    Image *const img2 = new Image(32, 32);
-    Image *const img3 = new Image(32, 32);
-    MapLayer *layer = nullptr;
-
-    SECTION("simple 1")
-    {
-        layer = new MapLayer("test",
-            0, 0,
-            1, 1,
-            false,
-            0,
-            0);
-        layer->setTile(0, 0, img1);
-        TileInfo *const tiles = layer->getTiles();
-        layer->updateCache(1, 1);
-        REQUIRE(tiles[0].isEnabled == true);
-        REQUIRE(tiles[0].width == 32);
-        REQUIRE(tiles[0].count == 0);
-        REQUIRE(tiles[0].nextTile == 0);
-    }
-
-    SECTION("simple 2")
-    {
-        layer = new MapLayer("test",
-            0, 0,
-            2, 1,
-            false,
-            0,
-            0);
-        layer->setTile(0, 0, img1);
-        TileInfo *const tiles = layer->getTiles();
-        layer->updateCache(2, 1);
-        REQUIRE(tiles[0].isEnabled == true);
-        REQUIRE(tiles[0].width == 32);
-        REQUIRE(tiles[0].count == 0);
-        REQUIRE(tiles[0].nextTile == 1);
-        REQUIRE(tiles[1].isEnabled == false);
-        REQUIRE(tiles[1].width == 0);
-        REQUIRE(tiles[1].count == 0);
-        REQUIRE(tiles[1].nextTile == 0);
-    }
-
-    SECTION("simple 3")
-    {
-        layer = new MapLayer("test",
-            0, 0,
-            2, 1,
-            false,
-            0,
-            0);
-        layer->setTile(0, 0, img1);
-        layer->setTile(1, 0, img2);
-        TileInfo *const tiles = layer->getTiles();
-        layer->updateCache(2, 1);
-        REQUIRE(tiles[0].isEnabled == true);
-        REQUIRE(tiles[0].width == 32);
-        REQUIRE(tiles[0].count == 0);
-        REQUIRE(tiles[0].nextTile == 0);
-        REQUIRE(tiles[1].isEnabled == true);
-        REQUIRE(tiles[1].width == 32);
-        REQUIRE(tiles[1].count == 0);
-        REQUIRE(tiles[1].nextTile == 0);
-    }
-
-    SECTION("simple 4")
-    {
-        layer = new MapLayer("test",
-            0, 0,
-            2, 1,
-            false,
-            0,
-            0);
-        layer->setTile(0, 0, img1);
-        layer->setTile(1, 0, img1);
-        TileInfo *const tiles = layer->getTiles();
-        layer->updateCache(2, 1);
-        REQUIRE(tiles[0].isEnabled == true);
-        REQUIRE(tiles[0].width == 64);
-        REQUIRE(tiles[0].count == 1);
-        REQUIRE(tiles[0].nextTile == 1);
-        REQUIRE(tiles[1].isEnabled == true);
-        REQUIRE(tiles[1].width == 32);
-        REQUIRE(tiles[1].count == 0);
-        REQUIRE(tiles[1].nextTile == 0);
-    }
-
-    SECTION("simple 4.2")
-    {
-        layer = new MapLayer("test",
-            0, 0,
-            3, 1,
-            false,
-            0,
-            0);
-        layer->setTile(0, 0, img1);
-        layer->setTile(2, 0, img1);
-        TileInfo *const tiles = layer->getTiles();
-        layer->updateCache(3, 1);
-        REQUIRE(tiles[0].isEnabled == true);
-        REQUIRE(tiles[0].width == 32);
-        REQUIRE(tiles[0].count == 0);
-        REQUIRE(tiles[0].nextTile == 1);
-        REQUIRE(tiles[1].isEnabled == false);
-        REQUIRE(tiles[1].width == 0);
-        REQUIRE(tiles[1].count == 0);
-        REQUIRE(tiles[1].nextTile == 0);
-        REQUIRE(tiles[2].isEnabled == true);
-        REQUIRE(tiles[2].width == 32);
-        REQUIRE(tiles[2].count == 0);
-        REQUIRE(tiles[2].nextTile == 0);
-    }
-
-    SECTION("simple 5")
-    {
-        layer = new MapLayer("test",
-            0, 0,
-            3, 1,
-            false,
-            0,
-            0);
-        layer->setTile(0, 0, img1);
-        layer->setTile(1, 0, img1);
-        TileInfo *const tiles = layer->getTiles();
-        layer->updateCache(3, 1);
-        REQUIRE(tiles[0].isEnabled == true);
-        REQUIRE(tiles[0].width == 64);
-        REQUIRE(tiles[0].count == 1);
-        REQUIRE(tiles[0].nextTile == 2);
-        REQUIRE(tiles[1].isEnabled == true);
-        REQUIRE(tiles[1].width == 32);
-        REQUIRE(tiles[1].count == 0);
-        REQUIRE(tiles[1].nextTile == 1);
-        REQUIRE(tiles[2].isEnabled == false);
-        REQUIRE(tiles[2].width == 0);
-        REQUIRE(tiles[2].count == 0);
-        REQUIRE(tiles[2].nextTile == 0);
-    }
-
-    SECTION("simple 6")
-    {
-        layer = new MapLayer("test",
-            0, 0,
-            3, 1,
-            false,
-            0,
-            0);
-        layer->setTile(0, 0, img1);
-        layer->setTile(1, 0, img1);
-        layer->setTile(2, 0, img2);
-        TileInfo *const tiles = layer->getTiles();
-        layer->updateCache(3, 1);
-        REQUIRE(tiles[0].isEnabled == true);
-        REQUIRE(tiles[0].width == 64);
-        REQUIRE(tiles[0].count == 1);
-        REQUIRE(tiles[0].nextTile == 1);
-        REQUIRE(tiles[1].isEnabled == true);
-        REQUIRE(tiles[1].width == 32);
-        REQUIRE(tiles[1].count == 0);
-        REQUIRE(tiles[1].nextTile == 0);
-        REQUIRE(tiles[2].isEnabled == true);
-        REQUIRE(tiles[2].width == 32);
-        REQUIRE(tiles[2].count == 0);
-        REQUIRE(tiles[2].nextTile == 0);
-    }
-
-    SECTION("simple 7")
-    {
-        layer = new MapLayer("test",
-            0, 0,
-            3, 1,
-            false,
-            0,
-            0);
-        layer->setTile(0, 0, img1);
-        layer->setTile(1, 0, img1);
-        layer->setTile(2, 0, img2);
-        TileInfo *const tiles = layer->getTiles();
-        tiles[0].isEnabled = false;
-        layer->updateCache(3, 1);
-        REQUIRE(tiles[0].isEnabled == false);
-        REQUIRE(tiles[0].width == 0);
-        REQUIRE(tiles[0].count == 0);
-        REQUIRE(tiles[0].nextTile == 0);
-        REQUIRE(tiles[1].isEnabled == true);
-        REQUIRE(tiles[1].width == 32);
-        REQUIRE(tiles[1].count == 0);
-        REQUIRE(tiles[1].nextTile == 0);
-        REQUIRE(tiles[2].isEnabled == true);
-        REQUIRE(tiles[2].width == 32);
-        REQUIRE(tiles[2].count == 0);
-        REQUIRE(tiles[2].nextTile == 0);
-    }
-
-    SECTION("normal 1")
-    {
-        layer = new MapLayer("test",
-            0, 0,
-            100, 100,
-            false,
-            0,
-            0);
-        layer->setTile(1, 10, img1);
-        layer->setTile(2, 10, img1);
-        layer->setTile(3, 10, img1);
-        layer->setTile(4, 10, img2);
-        layer->setTile(5, 10, nullptr);
-        layer->setTile(6, 10, img2);
-        layer->setTile(7, 10, nullptr);
-        layer->setTile(8, 10, nullptr);
-        layer->setTile(9, 10, img2);
-        layer->setTile(10, 10, img2);
-        layer->setTile(11, 10, img3);
-        layer->setTile(12, 10, nullptr);
-        layer->setTile(13, 10, nullptr);
-        layer->setTile(14, 10, nullptr);
-        layer->setTile(15, 10, img1);
-        layer->setTile(16, 10, img1);
-        layer->setTile(17, 10, img1);
-        TileInfo *const tiles = layer->getTiles();
-        layer->updateCache(100, 100);
-
-        REQUIRE(tiles[0 * 100 + 0].isEnabled == false);
-        REQUIRE(tiles[0 * 100 + 0].width == 0);
-        REQUIRE(tiles[0 * 100 + 0].count == 99);
-        REQUIRE(tiles[0 * 100 + 0].nextTile == 99);
-
-        REQUIRE(tiles[0 * 100 + 1].isEnabled == false);
-        REQUIRE(tiles[0 * 100 + 1].width == 0);
-        REQUIRE(tiles[0 * 100 + 1].count == 98);
-        REQUIRE(tiles[0 * 100 + 1].nextTile == 98);
-
-        REQUIRE(tiles[10 * 100 + 0].isEnabled == false);
-        REQUIRE(tiles[10 * 100 + 0].width == 0);
-        REQUIRE(tiles[10 * 100 + 0].count == 0);
-        REQUIRE(tiles[10 * 100 + 0].nextTile == 0);
-
-        REQUIRE(tiles[10 * 100 + 1].isEnabled == true);
-        REQUIRE(tiles[10 * 100 + 1].width == 96);
-        REQUIRE(tiles[10 * 100 + 1].count == 2);
-        REQUIRE(tiles[10 * 100 + 1].nextTile == 2);
-
-        REQUIRE(tiles[10 * 100 + 2].isEnabled == true);
-        REQUIRE(tiles[10 * 100 + 2].width == 64);
-        REQUIRE(tiles[10 * 100 + 2].count == 1);
-        REQUIRE(tiles[10 * 100 + 2].nextTile == 1);
-
-        REQUIRE(tiles[10 * 100 + 3].isEnabled == true);
-        REQUIRE(tiles[10 * 100 + 3].width == 32);
-        REQUIRE(tiles[10 * 100 + 3].count == 0);
-        REQUIRE(tiles[10 * 100 + 3].nextTile == 0);
-
-        REQUIRE(tiles[10 * 100 + 4].isEnabled == true);
-        REQUIRE(tiles[10 * 100 + 4].width == 32);
-        REQUIRE(tiles[10 * 100 + 4].count == 0);
-        REQUIRE(tiles[10 * 100 + 4].nextTile == 1);
-
-        REQUIRE(tiles[10 * 100 + 5].isEnabled == false);
-        REQUIRE(tiles[10 * 100 + 5].width == 0);
-        REQUIRE(tiles[10 * 100 + 5].count == 0);
-        REQUIRE(tiles[10 * 100 + 5].nextTile == 0);
-
-        REQUIRE(tiles[10 * 100 + 6].isEnabled == true);
-        REQUIRE(tiles[10 * 100 + 6].width == 32);
-        REQUIRE(tiles[10 * 100 + 6].count == 0);
-        REQUIRE(tiles[10 * 100 + 6].nextTile == 2);
-
-        REQUIRE(tiles[10 * 100 + 7].isEnabled == false);
-        REQUIRE(tiles[10 * 100 + 7].width == 0);
-        REQUIRE(tiles[10 * 100 + 7].count == 1);
-        REQUIRE(tiles[10 * 100 + 7].nextTile == 1);
-
-        REQUIRE(tiles[10 * 100 + 8].isEnabled == false);
-        REQUIRE(tiles[10 * 100 + 8].width == 0);
-        REQUIRE(tiles[10 * 100 + 8].count == 0);
-        REQUIRE(tiles[10 * 100 + 8].nextTile == 0);
-
-        REQUIRE(tiles[10 * 100 + 9].isEnabled == true);
-        REQUIRE(tiles[10 * 100 + 9].width == 64);
-        REQUIRE(tiles[10 * 100 + 9].count == 1);
-        REQUIRE(tiles[10 * 100 + 9].nextTile == 1);
-
-        REQUIRE(tiles[10 * 100 + 10].isEnabled == true);
-        REQUIRE(tiles[10 * 100 + 10].width == 32);
-        REQUIRE(tiles[10 * 100 + 10].count == 0);
-        REQUIRE(tiles[10 * 100 + 10].nextTile == 0);
-
-        REQUIRE(tiles[10 * 100 + 11].isEnabled == true);
-        REQUIRE(tiles[10 * 100 + 11].width == 32);
-        REQUIRE(tiles[10 * 100 + 11].count == 0);
-        REQUIRE(tiles[10 * 100 + 11].nextTile == 3);
-
-        REQUIRE(tiles[10 * 100 + 12].isEnabled == false);
-        REQUIRE(tiles[10 * 100 + 12].width == 0);
-        REQUIRE(tiles[10 * 100 + 12].count == 2);
-        REQUIRE(tiles[10 * 100 + 12].nextTile == 2);
-
-        REQUIRE(tiles[10 * 100 + 13].isEnabled == false);
-        REQUIRE(tiles[10 * 100 + 13].width == 0);
-        REQUIRE(tiles[10 * 100 + 13].count == 1);
-        REQUIRE(tiles[10 * 100 + 13].nextTile == 1);
-
-        REQUIRE(tiles[10 * 100 + 14].isEnabled == false);
-        REQUIRE(tiles[10 * 100 + 14].width == 0);
-        REQUIRE(tiles[10 * 100 + 14].count == 0);
-        REQUIRE(tiles[10 * 100 + 14].nextTile == 0);
-
-        REQUIRE(tiles[10 * 100 + 15].isEnabled == true);
-        REQUIRE(tiles[10 * 100 + 15].width == 96);
-        REQUIRE(tiles[10 * 100 + 15].count == 2);
-        REQUIRE(tiles[10 * 100 + 15].nextTile == 84);
-
-        REQUIRE(tiles[10 * 100 + 16].isEnabled == true);
-        REQUIRE(tiles[10 * 100 + 16].width == 64);
-        REQUIRE(tiles[10 * 100 + 16].count == 1);
-        REQUIRE(tiles[10 * 100 + 16].nextTile == 83);
-
-        REQUIRE(tiles[10 * 100 + 17].isEnabled == true);
-        REQUIRE(tiles[10 * 100 + 17].width == 32);
-        REQUIRE(tiles[10 * 100 + 17].count == 0);
-        REQUIRE(tiles[10 * 100 + 17].nextTile == 82);
-    }
-
-    SECTION("normal2")
-    {
-        const int maxX = 100;
-        const int maxY = 100;
-        layer = new MapLayer("test",
-            0, 0,
-            maxX, maxY,
-            false,
-            0,
-            0);
-        TileInfo *const tiles = layer->getTiles();
-        for (int x = 0; x < maxX; x ++)
-        {
-            for (int y = 0; y < maxY; y ++)
-            {
-                layer->setTile(x, y, img1);
-                tiles[y * maxX + x].isEnabled = false;
-            }
-        }
-        tiles[10 * maxX + 41].isEnabled = true;
-        layer->updateCache(maxX, maxY);
-
-        REQUIRE(tiles[10 * maxX + 0].isEnabled == false);
-        REQUIRE(tiles[10 * maxX + 0].width == 0);
-        REQUIRE(tiles[10 * maxX + 0].count == 40);
-        REQUIRE(tiles[10 * maxX + 0].nextTile == 40);
-
-        REQUIRE(tiles[10 * maxX + 1].isEnabled == false);
-        REQUIRE(tiles[10 * maxX + 1].width == 0);
-        REQUIRE(tiles[10 * maxX + 1].count == 39);
-        REQUIRE(tiles[10 * maxX + 1].nextTile == 39);
-    }
-
-    delete layer;
-    delete img1;
-    delete img2;
-    delete img3;
-}
diff --git a/src/unittests/resources/map/maplayer/updateconditiontiles.cc b/src/unittests/resources/map/maplayer/updateconditiontiles.cc
deleted file mode 100644
index f9b7cffc2..000000000
--- a/src/unittests/resources/map/maplayer/updateconditiontiles.cc
+++ /dev/null
@@ -1,231 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2016-2017  The ManaPlus Developers
- *
- *  This file is part of The ManaPlus Client.
- *
- *  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
- *  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, see <http://www.gnu.org/licenses/>.
- */
-
-#include "unittests/unittests.h"
-
-#include "configmanager.h"
-#include "dirs.h"
-
-#include "enums/resources/map/blockmask.h"
-
-#include "resources/image/image.h"
-
-#include "resources/map/map.h"
-#include "resources/map/maplayer.h"
-
-#include "debug.h"
-
-TEST_CASE("MapLayer updateConditionTiles", "")
-{
-    Dirs::initRootDir();
-    Dirs::initHomeDir();
-
-    ConfigManager::initConfiguration();
-
-    Image *const img1 = new Image(32, 32);
-    Map *map = nullptr;
-    MapLayer *layer = nullptr;
-
-    SECTION("simple 1")
-    {
-        map = new Map("map",
-            1, 1,
-            32, 32);
-        layer = new MapLayer("test",
-            0, 0,
-            1, 1,
-            false,
-            0,
-            0);
-        layer->setTile(0, 0, img1);
-        map->addLayer(layer);
-        layer->setTileCondition(BlockMask::WATER);
-        TileInfo *const tiles = layer->getTiles();
-
-        map->addBlockMask(0, 0, BlockType::NONE);
-        layer->updateConditionTiles(map->getMetaTiles(),
-            1, 1);
-        REQUIRE(tiles[0].isEnabled == false);
-
-        map->addBlockMask(0, 0, BlockType::WATER);
-        layer->updateConditionTiles(map->getMetaTiles(),
-            1, 1);
-        REQUIRE(tiles[0].isEnabled == true);
-    }
-
-    SECTION("normal 1")
-    {
-        map = new Map("map",
-            100, 200,
-            32, 32);
-        layer = new MapLayer("test",
-            0, 0,
-            100, 200,
-            false,
-            0,
-            0);
-        layer->setTile(10, 10, img1);
-        layer->setTile(10, 20, img1);
-        layer->setTile(10, 30, img1);
-        map->addLayer(layer);
-        layer->setTileCondition(BlockMask::WATER);
-        TileInfo *const tiles = layer->getTiles();
-
-        map->addBlockMask(10, 10, BlockType::NONE);
-        map->addBlockMask(10, 20, BlockType::NONE);
-        map->addBlockMask(20, 20, BlockType::NONE);
-        layer->updateConditionTiles(map->getMetaTiles(),
-            100, 200);
-        for (int x = 0; x < 100; x ++)
-        {
-            for (int y = 0; y < 200; y ++)
-            {
-                REQUIRE(tiles[y * 100 + x].isEnabled == false);
-            }
-        }
-    }
-
-    SECTION("normal 2")
-    {
-        map = new Map("map",
-            100, 200,
-            32, 32);
-        layer = new MapLayer("test",
-            0, 0,
-            100, 200,
-            false,
-            0,
-            0);
-        layer->setTile(10, 10, img1);
-        layer->setTile(10, 20, img1);
-        layer->setTile(10, 30, img1);
-        map->addLayer(layer);
-        layer->setTileCondition(BlockMask::WATER);
-        TileInfo *const tiles = layer->getTiles();
-
-        map->addBlockMask(10, 10, BlockType::WATER);
-        map->addBlockMask(10, 20, BlockType::WATER);
-        map->addBlockMask(20, 20, BlockType::WATER);
-        layer->updateConditionTiles(map->getMetaTiles(),
-            100, 200);
-        for (int x = 0; x < 100; x ++)
-        {
-            for (int y = 0; y < 200; y ++)
-            {
-                if ((x == 10 && y == 10) || (x == 10 && y == 20))
-                {
-                    REQUIRE(tiles[y * 100 + x].isEnabled == true);
-                }
-                else
-                {
-                    REQUIRE(tiles[y * 100 + x].isEnabled == false);
-                }
-            }
-        }
-    }
-
-    SECTION("normal 3")
-    {
-        map = new Map("map",
-            100, 200,
-            32, 32);
-        layer = new MapLayer("test",
-            0, 0,
-            100, 200,
-            false,
-            0,
-            0);
-        for (int x = 0; x < 100; x ++)
-        {
-            for (int y = 0; y < 200; y ++)
-            {
-                layer->setTile(x, y, img1);
-            }
-        }
-        map->addLayer(layer);
-        layer->setTileCondition(BlockMask::WATER);
-        TileInfo *const tiles = layer->getTiles();
-
-        map->addBlockMask(10, 10, BlockType::WATER);
-        map->addBlockMask(10, 20, BlockType::WATER);
-        layer->updateConditionTiles(map->getMetaTiles(),
-            100, 200);
-        for (int x = 0; x < 100; x ++)
-        {
-            for (int y = 0; y < 200; y ++)
-            {
-                if ((x == 10 && y == 10) || (x == 10 && y == 20))
-                {
-                    REQUIRE(tiles[y * 100 + x].isEnabled == true);
-                }
-                else
-                {
-                    REQUIRE(tiles[y * 100 + x].isEnabled == false);
-                }
-            }
-        }
-    }
-
-    SECTION("normal 4")
-    {
-        map = new Map("map",
-            100, 200,
-            32, 32);
-        layer = new MapLayer("test",
-            0, 0,
-            100, 200,
-            false,
-            0,
-            0);
-        layer->setTile(10, 10, img1);
-        layer->setTile(10, 20, img1);
-        map->addLayer(layer);
-        layer->setTileCondition(BlockMask::WATER);
-        TileInfo *const tiles = layer->getTiles();
-
-        for (int x = 0; x < 100; x ++)
-        {
-            for (int y = 0; y < 200; y ++)
-            {
-                map->addBlockMask(x, y, BlockType::WATER);
-            }
-        }
-
-        layer->updateConditionTiles(map->getMetaTiles(),
-            100, 200);
-        for (int x = 0; x < 100; x ++)
-        {
-            for (int y = 0; y < 200; y ++)
-            {
-                if ((x == 10 && y == 10) || (x == 10 && y == 20))
-                {
-                    REQUIRE(tiles[y * 100 + x].isEnabled == true);
-                }
-                else
-                {
-                    REQUIRE(tiles[y * 100 + x].isEnabled == false);
-                }
-            }
-        }
-    }
-
-    delete map;
-    delete img1;
-}
diff --git a/src/unittests/resources/map/speciallayer.cc b/src/unittests/resources/map/speciallayer.cc
deleted file mode 100644
index 2e72d6e19..000000000
--- a/src/unittests/resources/map/speciallayer.cc
+++ /dev/null
@@ -1,288 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2016-2017  The ManaPlus Developers
- *
- *  This file is part of The ManaPlus Client.
- *
- *  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
- *  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, see <http://www.gnu.org/licenses/>.
- */
-
-#include "unittests/unittests.h"
-
-#include "client.h"
-#include "configmanager.h"
-#include "configuration.h"
-#include "dirs.h"
-
-#include "graphicsmanager.h"
-
-#include "being/actorsprite.h"
-
-#include "gui/userpalette.h"
-#include "gui/theme.h"
-
-#include "enums/resources/map/mapitemtype.h"
-
-#include "fs/virtfs/fs.h"
-
-#include "utils/delete2.h"
-#include "utils/env.h"
-
-#include "resources/sdlimagehelper.h"
-
-#include "resources/map/speciallayer.h"
-
-#include "resources/resourcemanager/resourcemanager.h"
-
-#include "debug.h"
-
-TEST_CASE("SpecialLayer updateCache", "")
-{
-    setEnv("SDL_VIDEODRIVER", "dummy");
-
-    client = new Client;
-    VirtFs::mountDirSilent("data", Append_false);
-    VirtFs::mountDirSilent("../data", Append_false);
-
-    imageHelper = new SDLImageHelper;
-
-    Dirs::initRootDir();
-    Dirs::initHomeDir();
-
-    setBrandingDefaults(branding);
-    ConfigManager::initConfiguration();
-
-#ifdef USE_SDL2
-    SDLImageHelper::setRenderer(graphicsManager.createRenderer(
-        graphicsManager.createWindow(640, 480, 0,
-        SDL_WINDOW_SHOWN | SDL_SWSURFACE), SDL_RENDERER_SOFTWARE));
-#else  // USE_SDL2
-
-    graphicsManager.createWindow(640, 480, 0, SDL_ANYFORMAT | SDL_SWSURFACE);
-#endif  // USE_SDL2
-
-    userPalette = new UserPalette;
-
-    theme = new Theme;
-    Theme::selectSkin();
-
-    ActorSprite::load();
-
-    SpecialLayer *layer = nullptr;
-
-    SECTION("simple 1")
-    {
-        layer = new SpecialLayer("test",
-            1, 1);
-        const int *const cache = layer->getCache();
-        REQUIRE(cache[0] == 10000);
-        layer->setTile(0, 0, MapItemType::ARROW_UP);
-        layer->updateCache();
-        REQUIRE(cache[0] == 10000);
-    }
-
-    SECTION("simple 2")
-    {
-        layer = new SpecialLayer("test",
-            2, 1);
-        const int *const cache = layer->getCache();
-        REQUIRE(cache[0] == 10000);
-        REQUIRE(cache[1] == 10000);
-        layer->setTile(0, 0, MapItemType::ARROW_UP);
-        layer->updateCache();
-        REQUIRE(cache[0] == 10000);
-        REQUIRE(cache[1] == 10000);
-    }
-
-    SECTION("simple 3")
-    {
-        layer = new SpecialLayer("test",
-            2, 1);
-        layer->setTile(0, 0, MapItemType::ARROW_UP);
-        layer->setTile(1, 0, MapItemType::ARROW_DOWN);
-        const int *const cache = layer->getCache();
-        layer->updateCache();
-        REQUIRE(cache[0] == 0);
-        REQUIRE(cache[1] == 10000);
-    }
-
-    SECTION("simple 4")
-    {
-        layer = new SpecialLayer("test",
-            2, 1);
-        layer->setTile(0, 0, MapItemType::ARROW_UP);
-        layer->setTile(1, 0, MapItemType::ARROW_UP);
-        const int *const cache = layer->getCache();
-        layer->updateCache();
-        REQUIRE(cache[0] == 0);
-        REQUIRE(cache[1] == 10000);
-    }
-
-    SECTION("simple 4.2")
-    {
-        layer = new SpecialLayer("test",
-            3, 1);
-        layer->setTile(0, 0, MapItemType::ARROW_UP);
-        layer->setTile(2, 0, MapItemType::ARROW_UP);
-        const int *const cache = layer->getCache();
-        layer->updateCache();
-        REQUIRE(cache[0] == 1);
-        REQUIRE(cache[1] == 0);
-        REQUIRE(cache[2] == 10000);
-    }
-
-    SECTION("simple 5")
-    {
-        layer = new SpecialLayer("test",
-            3, 1);
-        layer->setTile(0, 0, MapItemType::ARROW_UP);
-        layer->setTile(1, 0, MapItemType::ARROW_UP);
-        const int *const cache = layer->getCache();
-        layer->updateCache();
-        REQUIRE(cache[0] == 0);
-        REQUIRE(cache[1] == 10000);
-        REQUIRE(cache[2] == 10000);
-    }
-
-    SECTION("simple 6")
-    {
-        layer = new SpecialLayer("test",
-            3, 1);
-        layer->setTile(0, 0, MapItemType::ARROW_UP);
-        layer->setTile(1, 0, MapItemType::ARROW_UP);
-        layer->setTile(2, 0, MapItemType::ARROW_DOWN);
-        const int *const cache = layer->getCache();
-        layer->updateCache();
-        REQUIRE(cache[0] == 0);
-        REQUIRE(cache[1] == 0);
-        REQUIRE(cache[2] == 10000);
-    }
-
-    SECTION("simple 7")
-    {
-        layer = new SpecialLayer("test",
-            3, 1);
-        const int *const cache = layer->getCache();
-        layer->updateCache();
-        REQUIRE(cache[0] == 10000);
-        REQUIRE(cache[1] == 10000);
-        REQUIRE(cache[2] == 10000);
-    }
-
-    SECTION("simple 8")
-    {
-        layer = new SpecialLayer("test",
-            3, 1);
-        layer->setTile(0, 0, MapItemType::EMPTY);
-        layer->setTile(1, 0, MapItemType::EMPTY);
-        layer->setTile(2, 0, MapItemType::EMPTY);
-        const int *const cache = layer->getCache();
-        layer->updateCache();
-        REQUIRE(cache[0] == 10000);
-        REQUIRE(cache[1] == 10000);
-        REQUIRE(cache[2] == 10000);
-    }
-
-    SECTION("simple 9")
-    {
-        layer = new SpecialLayer("test",
-            2, 1);
-        const int *const cache = layer->getCache();
-        REQUIRE(cache[0] == 10000);
-        REQUIRE(cache[1] == 10000);
-        layer->setTile(1, 0, MapItemType::ARROW_UP);
-        layer->updateCache();
-        REQUIRE(cache[0] == 0);
-        REQUIRE(cache[1] == 10000);
-    }
-
-    SECTION("normal 1")
-    {
-        layer = new SpecialLayer("test",
-            100, 100);
-        layer->setTile(1, 10, MapItemType::ARROW_UP);
-        layer->setTile(2, 10, MapItemType::ARROW_UP);
-        layer->setTile(3, 10, MapItemType::ARROW_UP);
-        layer->setTile(4, 10, MapItemType::ARROW_DOWN);
-        layer->setTile(5, 10, MapItemType::EMPTY);
-        layer->setTile(6, 10, MapItemType::ARROW_DOWN);
-        layer->setTile(7, 10, MapItemType::EMPTY);
-        layer->setTile(8, 10, MapItemType::EMPTY);
-        layer->setTile(9, 10, MapItemType::ARROW_DOWN);
-        layer->setTile(10, 10, MapItemType::ARROW_DOWN);
-        layer->setTile(11, 10, MapItemType::ARROW_LEFT);
-        layer->setTile(12, 10, MapItemType::EMPTY);
-        layer->setTile(13, 10, MapItemType::EMPTY);
-        layer->setTile(14, 10, MapItemType::EMPTY);
-        layer->setTile(15, 10, MapItemType::ARROW_UP);
-        layer->setTile(16, 10, MapItemType::ARROW_UP);
-        layer->setTile(17, 10, MapItemType::ARROW_UP);
-        const int *const cache = layer->getCache();
-        layer->updateCache();
-
-        REQUIRE(cache[10 * 100 + 0] == 0);
-        REQUIRE(cache[10 * 100 + 1] == 0);
-        REQUIRE(cache[10 * 100 + 2] == 0);
-        REQUIRE(cache[10 * 100 + 3] == 0);
-        REQUIRE(cache[10 * 100 + 4] == 1);
-        REQUIRE(cache[10 * 100 + 5] == 0);
-        REQUIRE(cache[10 * 100 + 6] == 2);
-        REQUIRE(cache[10 * 100 + 7] == 1);
-        REQUIRE(cache[10 * 100 + 8] == 0);
-        REQUIRE(cache[10 * 100 + 9] == 0);
-        REQUIRE(cache[10 * 100 + 10] == 0);
-        REQUIRE(cache[10 * 100 + 11] == 3);
-        REQUIRE(cache[10 * 100 + 12] == 2);
-        REQUIRE(cache[10 * 100 + 13] == 1);
-        REQUIRE(cache[10 * 100 + 14] == 0);
-        REQUIRE(cache[10 * 100 + 15] == 0);
-        REQUIRE(cache[10 * 100 + 16] == 0);
-        REQUIRE(cache[10 * 100 + 17] == 10000);
-    }
-
-    SECTION("normal2")
-    {
-        const int maxX = 100;
-        const int maxY = 100;
-        layer = new SpecialLayer("test",
-            maxX, maxY);
-        const int *const cache = layer->getCache();
-        for (int x = 0; x < maxX; x ++)
-        {
-            for (int y = 0; y < maxY; y ++)
-            {
-                layer->setTile(x, y, MapItemType::ARROW_UP);
-                REQUIRE(layer->getTiles()[x + y * maxX] != nullptr);
-            }
-        }
-        layer->updateCache();
-
-        for (int y = 0; y < maxY; y ++)
-        {
-            for (int x = 0; x < maxX - 1; x ++)
-            {
-                REQUIRE(cache[y * maxX + x] == 0);
-            }
-            REQUIRE(cache[y * maxX + maxX - 1] == 10000);
-        }
-    }
-
-    delete layer;
-    ResourceManager::cleanOrphans();
-    delete2(userPalette);
-    delete2(theme);
-    delete2(client);
-    VirtFs::unmountDirSilent("data");
-    VirtFs::unmountDirSilent("../data");
-}
diff --git a/src/unittests/resources/mstack.cc b/src/unittests/resources/mstack.cc
deleted file mode 100644
index 1d2233803..000000000
--- a/src/unittests/resources/mstack.cc
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2015-2017  The ManaPlus Developers
- *
- *  This file is part of The ManaPlus Client.
- *
- *  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
- *  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, see <http://www.gnu.org/licenses/>.
- */
-
-#include "unittests/unittests.h"
-
-#include "gui/cliprect.h"
-
-#include "resources/mstack.h"
-
-#include "debug.h"
-
-TEST_CASE("mstack push 1", "")
-{
-    MStack<ClipRect> stack(10);
-    REQUIRE(-1 == (stack.mPointer - stack.mStack));
-    REQUIRE(0 == stack.mStack[0].xOffset);
-
-    ClipRect &val1 = stack.push();
-    val1.xOffset = 10;
-    ClipRect &val2 = stack.top();
-    REQUIRE(0 == stack.mPointer - stack.mStack);
-    REQUIRE(10 == val2.xOffset);
-    REQUIRE(10 == stack.mStack[0].xOffset);
-    REQUIRE(0 == stack.mStack[1].xOffset);
-
-    val2.yOffset = 2;
-    REQUIRE(2 == val1.yOffset);
-}
-
-TEST_CASE("mstack push 2", "")
-{
-    MStack<ClipRect> stack(10);
-    ClipRect &val1 = stack.push();
-    val1.xOffset = 10;
-    const ClipRect &val2 = stack.top();
-    REQUIRE(10 == val2.xOffset);
-    REQUIRE(10 == stack.mStack[0].xOffset);
-
-    val1.yOffset = 2;
-    REQUIRE(2 == val2.yOffset);
-    REQUIRE(2 == stack.mStack[0].yOffset);
-}
-
-TEST_CASE("mstack push 3", "")
-{
-    MStack<ClipRect> stack(10);
-    ClipRect &val1 = stack.push();
-    val1.xOffset = 10;
-    ClipRect &val2 = stack.top();
-    REQUIRE(10 == val2.xOffset);
-    REQUIRE(10 == stack.mStack[0].xOffset);
-}
-
-TEST_CASE("mstack push 4", "")
-{
-    MStack<ClipRect> stack(10);
-    ClipRect &val1 = stack.push();
-    val1.xOffset = 10;
-    REQUIRE(10 == val1.xOffset);
-    REQUIRE(10 == stack.mStack[0].xOffset);
-    REQUIRE(0 == stack.mStack[1].xOffset);
-    REQUIRE(0 == stack.mStack[2].xOffset);
-
-    ClipRect &val2 = stack.push();
-    val2.xOffset = 20;
-    REQUIRE(20 == val2.xOffset);
-    REQUIRE(10 == stack.mStack[0].xOffset);
-    REQUIRE(20 == stack.mStack[1].xOffset);
-    REQUIRE(0 == stack.mStack[2].xOffset);
-
-    ClipRect &val3 = stack.push();
-    val3.xOffset = 30;
-    REQUIRE(30 == val3.xOffset);
-    REQUIRE(10 == stack.mStack[0].xOffset);
-    REQUIRE(20 == stack.mStack[1].xOffset);
-    REQUIRE(30 == stack.mStack[2].xOffset);
-}
-
-TEST_CASE("mstack pop 1", "")
-{
-    MStack<ClipRect> stack(10);
-    ClipRect &val1 = stack.push();
-    val1.xOffset = 10;
-    REQUIRE(10 == stack.mStack[0].xOffset);
-
-    stack.pop();
-    REQUIRE(-1 == stack.mPointer - stack.mStack);
-}
-
-TEST_CASE("mstack pop 2", "")
-{
-    MStack<ClipRect> stack(10);
-    ClipRect &val1 = stack.push();
-    REQUIRE(0 == stack.mPointer - stack.mStack);
-
-    val1.xOffset = 10;
-    REQUIRE(10 == stack.mStack[0].xOffset);
-
-    ClipRect &val2 = stack.push();
-    REQUIRE(1 == stack.mPointer - stack.mStack);
-
-    val2.xOffset = 20;
-    REQUIRE(10 == stack.mStack[0].xOffset);
-    REQUIRE(20 == stack.mStack[1].xOffset);
-
-    stack.pop();
-    REQUIRE(0 == stack.mPointer - stack.mStack);
-    REQUIRE(10 == stack.mStack[0].xOffset);
-    REQUIRE(20 == stack.mStack[1].xOffset);
-
-    ClipRect &val3 = stack.top();
-    REQUIRE(0 == stack.mPointer - stack.mStack);
-    REQUIRE(10 == val1.xOffset);
-    REQUIRE(20 == val2.xOffset);
-    REQUIRE(10 == val3.xOffset);
-    REQUIRE(10 == stack.mStack[0].xOffset);
-    REQUIRE(20 == stack.mStack[1].xOffset);
-    REQUIRE(0 == stack.mStack[2].xOffset);
-}
-
-TEST_CASE("mstack clear 1", "")
-{
-    MStack<ClipRect> stack(10);
-    REQUIRE(-1 == stack.mPointer - stack.mStack);
-    REQUIRE(0 == stack.mStack[0].xOffset);
-
-    ClipRect &val1 = stack.push();
-    val1.xOffset = 10;
-
-    stack.clear();
-    REQUIRE(-1 == stack.mPointer - stack.mStack);
-    REQUIRE(10 == stack.mStack[0].xOffset);
-    REQUIRE(0 == stack.mStack[1].xOffset);
-}
-
-TEST_CASE("mstack getpop 1", "")
-{
-    MStack<ClipRect> stack(10);
-    ClipRect &val1 = stack.push();
-    val1.xOffset = 10;
-    REQUIRE(10 == stack.mStack[0].xOffset);
-    REQUIRE(10 == val1.xOffset);
-
-    ClipRect &val2 = stack.getPop();
-    REQUIRE(-1 == stack.mPointer - stack.mStack);
-    REQUIRE(10 == stack.mStack[0].xOffset);
-    REQUIRE(10 == val2.xOffset);
-}
diff --git a/src/unittests/resources/resourcemanager/resourcemanager.cc b/src/unittests/resources/resourcemanager/resourcemanager.cc
deleted file mode 100644
index 4b67af82e..000000000
--- a/src/unittests/resources/resourcemanager/resourcemanager.cc
+++ /dev/null
@@ -1,693 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2013-2017  The ManaPlus Developers
- *
- *  This file is part of The ManaPlus Client.
- *
- *  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
- *  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, see <http://www.gnu.org/licenses/>.
- */
-
-#include "unittests/unittests.h"
-
-#include "client.h"
-#include "configmanager.h"
-#include "configuration.h"
-#include "dirs.h"
-#include "graphicsmanager.h"
-
-#include "being/actorsprite.h"
-
-#include "fs/virtfs/fs.h"
-
-#include "gui/userpalette.h"
-#include "gui/theme.h"
-
-#include "resources/sdlimagehelper.h"
-
-#include "resources/resourcemanager/resourcemanager.h"
-
-#include "utils/env.h"
-#include "utils/delete2.h"
-
-#include <unistd.h>
-
-PRAGMA48(GCC diagnostic push)
-PRAGMA48(GCC diagnostic ignored "-Wshadow")
-#ifndef USE_SDL2
-#include <SDL.h>
-#endif  // USE_SDL2
-PRAGMA48(GCC diagnostic pop)
-
-#include "debug.h"
-
-namespace
-{
-    int testResouceCounter = 0;
-
-    class TestResource : public Resource
-    {
-        public:
-            TestResource() :
-                Resource()
-            {
-                testResouceCounter ++;
-            }
-
-            ~TestResource()
-            {
-                testResouceCounter --;
-            }
-    };
-
-    struct TestLoader final
-    {
-        std::string path;
-        static Resource *load(const void *const v)
-        {
-            BLOCK_START("TestLoader::load")
-            if (v == nullptr)
-            {
-                BLOCK_END("TestLoader::load")
-                return nullptr;
-            }
-
-            Resource *const res = new TestResource();
-            BLOCK_END("TestLoader::load")
-            return res;
-        }
-    };
-
-}  // namespace
-
-TEST_CASE("resourcemanager", "resourcemanager")
-{
-    setEnv("SDL_VIDEODRIVER", "dummy");
-
-    client = new Client;
-    XML::initXML();
-    SDL_Init(SDL_INIT_VIDEO);
-    VirtFs::mountDirSilent("data", Append_false);
-    VirtFs::mountDirSilent("../data", Append_false);
-
-    imageHelper = new SDLImageHelper();
-
-    Dirs::initRootDir();
-    Dirs::initHomeDir();
-
-    setBrandingDefaults(branding);
-    ConfigManager::initConfiguration();
-
-#ifdef USE_SDL2
-    SDLImageHelper::setRenderer(graphicsManager.createRenderer(
-        graphicsManager.createWindow(640, 480, 0,
-        SDL_WINDOW_SHOWN | SDL_SWSURFACE), SDL_RENDERER_SOFTWARE));
-#else  // USE_SDL2
-
-    graphicsManager.createWindow(640, 480, 0, SDL_ANYFORMAT | SDL_SWSURFACE);
-#endif  // USE_SDL2
-
-    userPalette = new UserPalette;
-
-    theme = new Theme;
-    Theme::selectSkin();
-
-    ActorSprite::load();
-
-//    ConfigManager::initConfiguration();
-//    setConfigDefaults2(config);
-
-    while (ResourceManager::cleanOrphans(true))
-        continue;
-
-    testResouceCounter = 0;
-    const size_t resSize = ResourceManager::getResources().size();
-
-    SECTION("resourcemanager get 0")
-    {
-        REQUIRE(testResouceCounter == 0);
-        REQUIRE(ResourceManager::getResources().size() == 0 + resSize);
-        REQUIRE(ResourceManager::getOrphanedResources().empty() == true);
-        REQUIRE(ResourceManager::getDeletedResources().empty() == true);
-    }
-
-    SECTION("resourcemanager get 1")
-    {
-        REQUIRE(testResouceCounter == 0);
-        TestLoader rl = { "test1" };
-        Resource *res = ResourceManager::get("test1",
-            TestLoader::load, &rl);
-        REQUIRE(testResouceCounter == 1);
-        REQUIRE(res != nullptr);
-        REQUIRE(res->mRefCount == 1);
-        REQUIRE(ResourceManager::getResources().size() == 1 + resSize);
-        REQUIRE(ResourceManager::getResources()["test1"] == res);
-        REQUIRE(ResourceManager::getOrphanedResources().empty() == true);
-        REQUIRE(ResourceManager::getDeletedResources().empty() == true);
-        res->decRef();
-        REQUIRE(res->mRefCount == 0);
-    }
-
-    SECTION("resourcemanager get 2")
-    {
-        TestLoader rl = { "test1" };
-        Resource *const res = ResourceManager::get("test1",
-            TestLoader::load, &rl);
-        REQUIRE(res != nullptr);
-        REQUIRE(testResouceCounter == 1);
-        REQUIRE(res->mRefCount == 1);
-        res->mSource = "source 1";
-        REQUIRE(res->mSource == "source 1");
-        REQUIRE(ResourceManager::getResources().size() == 1 + resSize);
-        REQUIRE(ResourceManager::getResources()["test1"] == res);
-        REQUIRE(ResourceManager::getOrphanedResources().empty() == true);
-        REQUIRE(ResourceManager::getDeletedResources().empty() == true);
-        Resource *const res2 = ResourceManager::get("test1",
-            TestLoader::load, &rl);
-        REQUIRE(res2 != nullptr);
-        REQUIRE(testResouceCounter == 1);
-        REQUIRE(res->mRefCount == 2);
-        REQUIRE(res2->mRefCount == 2);
-        REQUIRE(res->mIdPath == res2->mIdPath);
-        REQUIRE(res2->mSource == "source 1");
-        REQUIRE(ResourceManager::getResources().size() == 1 + resSize);
-        REQUIRE(ResourceManager::getResources()["test1"] == res2);
-        REQUIRE(ResourceManager::getOrphanedResources().empty() == true);
-        REQUIRE(ResourceManager::getDeletedResources().empty() == true);
-        res->decRef();
-        res2->decRef();
-        REQUIRE(res->mRefCount == 0);
-    }
-
-    SECTION("resourcemanager get 3")
-    {
-        TestLoader rl = { "test1" };
-        Resource *res = ResourceManager::get("test1",
-            TestLoader::load, &rl);
-        REQUIRE(res != nullptr);
-        REQUIRE(testResouceCounter == 1);
-        REQUIRE(res->mRefCount == 1);
-        REQUIRE(ResourceManager::getResources().size() == 1 + resSize);
-        REQUIRE(ResourceManager::getResources()["test1"] == res);
-        REQUIRE(ResourceManager::getOrphanedResources().empty() == true);
-        REQUIRE(ResourceManager::getDeletedResources().empty() == true);
-        res->mSource = "source 1";
-        res->decRef();
-        REQUIRE(ResourceManager::getResources().size() == 0 + resSize);
-        REQUIRE(ResourceManager::getOrphanedResources()["test1"] == res);
-        REQUIRE(ResourceManager::getDeletedResources().empty() == true);
-        REQUIRE(res->mRefCount == 0);
-    }
-
-    SECTION("resourcemanager get 4")
-    {
-        TestLoader rl = { "test1" };
-        Resource *res = ResourceManager::get("test1",
-            TestLoader::load, &rl);
-        REQUIRE(res != nullptr);
-        REQUIRE(testResouceCounter == 1);
-        REQUIRE(res->mRefCount == 1);
-        REQUIRE(ResourceManager::getResources().size() == 1 + resSize);
-        REQUIRE(ResourceManager::getResources()["test1"] == res);
-        REQUIRE(ResourceManager::getOrphanedResources().empty() == true);
-        REQUIRE(ResourceManager::getDeletedResources().empty() == true);
-        res->mSource = "source 1";
-        res->decRef();
-        REQUIRE(res->mRefCount == 0);
-        REQUIRE(ResourceManager::getResources().size() == 0 + resSize);
-        REQUIRE(ResourceManager::getOrphanedResources()["test1"] == res);
-        REQUIRE(ResourceManager::getDeletedResources().empty() == true);
-
-        Resource *const res2 = ResourceManager::get("test1",
-            TestLoader::load, &rl);
-        REQUIRE(res2 != nullptr);
-        REQUIRE(testResouceCounter == 1);
-        REQUIRE(res2->mRefCount == 1);
-        REQUIRE(res->mIdPath == res2->mIdPath);
-        REQUIRE(res2->mSource == "source 1");
-        REQUIRE(ResourceManager::getResources().size() == 1 + resSize);
-        REQUIRE(ResourceManager::getResources()["test1"] == res2);
-        REQUIRE(ResourceManager::getOrphanedResources().empty() == true);
-        REQUIRE(ResourceManager::getDeletedResources().empty() == true);
-        res2->decRef();
-        REQUIRE(res->mRefCount == 0);
-    }
-
-    SECTION("resourcemanager get 5")
-    {
-        TestLoader rl = { "test1" };
-        Resource *res = ResourceManager::get("test1",
-            TestLoader::load, &rl);
-        REQUIRE(ResourceManager::isInCache("test1") == true);
-        REQUIRE(res != nullptr);
-        REQUIRE(testResouceCounter == 1);
-        REQUIRE(res->mRefCount == 1);
-        REQUIRE(ResourceManager::getResources().size() == 1 + resSize);
-        REQUIRE(ResourceManager::getResources()["test1"] == res);
-        REQUIRE(ResourceManager::getOrphanedResources().empty() == true);
-        REQUIRE(ResourceManager::getDeletedResources().empty() == true);
-        res->mSource = "source 1";
-        res->decRef();
-        REQUIRE(res->mRefCount == 0);
-        REQUIRE(ResourceManager::getResources().size() == 0 + resSize);
-        REQUIRE(ResourceManager::getOrphanedResources().size() == 1);
-        REQUIRE(ResourceManager::getOrphanedResources()["test1"] == res);
-        REQUIRE(ResourceManager::getDeletedResources().empty() == true);
-
-        sleep(33);
-        ResourceManager::cleanOrphans();
-        REQUIRE(ResourceManager::isInCache("test1") == false);
-        REQUIRE(testResouceCounter == 0);
-        REQUIRE(ResourceManager::getResources().size() == 0 + resSize);
-        REQUIRE(ResourceManager::getOrphanedResources().empty() == true);
-        REQUIRE(ResourceManager::getDeletedResources().empty() == true);
-
-        Resource *const res2 = ResourceManager::get("test1",
-            TestLoader::load, &rl);
-        REQUIRE(ResourceManager::isInCache("test1") == true);
-        REQUIRE(res2 != nullptr);
-        REQUIRE(testResouceCounter == 1);
-        REQUIRE(res2->mRefCount == 1);
-        REQUIRE(res2->mSource.empty());
-        REQUIRE(ResourceManager::getResources().size() == 1 + resSize);
-        REQUIRE(ResourceManager::getResources()["test1"] == res2);
-        REQUIRE(ResourceManager::getOrphanedResources().empty() == true);
-        REQUIRE(ResourceManager::getDeletedResources().empty() == true);
-        res2->decRef();
-        REQUIRE(res2->mRefCount == 0);
-    }
-
-    SECTION("resourcemanager get 6")
-    {
-        TestLoader rl = { "test1" };
-        Resource *res = ResourceManager::get("test1",
-            TestLoader::load, &rl);
-        REQUIRE(res != nullptr);
-        REQUIRE(testResouceCounter == 1);
-        REQUIRE(res->mRefCount == 1);
-        res->mSource = "source 1";
-        REQUIRE(ResourceManager::getResources().size() == 1 + resSize);
-        REQUIRE(ResourceManager::getResources()["test1"] == res);
-        REQUIRE(ResourceManager::getOrphanedResources().empty() == true);
-        REQUIRE(ResourceManager::getDeletedResources().empty() == true);
-
-        Resource *const res2 = ResourceManager::get("test2",
-            TestLoader::load, &rl);
-        REQUIRE(res2 != nullptr);
-        REQUIRE(testResouceCounter == 2);
-        REQUIRE(res2->mRefCount == 1);
-        REQUIRE(res2->mSource.empty());
-        REQUIRE(ResourceManager::getResources().size() == 2 + resSize);
-        REQUIRE(ResourceManager::getResources()["test1"] == res);
-        REQUIRE(ResourceManager::getResources()["test2"] == res2);
-        REQUIRE(ResourceManager::getOrphanedResources().empty() == true);
-        REQUIRE(ResourceManager::getDeletedResources().empty() == true);
-        res->decRef();
-        res2->decRef();
-        REQUIRE(res->mRefCount == 0);
-        REQUIRE(res2->mRefCount == 0);
-    }
-
-    SECTION("resourcemanager getFromCache 1")
-    {
-        TestLoader rl = { "test1" };
-        Resource *res = ResourceManager::get("test1",
-            TestLoader::load, &rl);
-        REQUIRE(res != nullptr);
-        REQUIRE(testResouceCounter == 1);
-        REQUIRE(res->mRefCount == 1);
-        REQUIRE(ResourceManager::getResources().size() == 1 + resSize);
-        REQUIRE(ResourceManager::getResources()["test1"] == res);
-        REQUIRE(ResourceManager::getOrphanedResources().empty() == true);
-        REQUIRE(ResourceManager::getDeletedResources().empty() == true);
-        Resource *const res2 = ResourceManager::getFromCache("test1");
-        REQUIRE(res2 != nullptr);
-        REQUIRE(testResouceCounter == 1);
-        REQUIRE(res2->mRefCount == 2);
-        REQUIRE(res == res2);
-        REQUIRE(res2->mSource.empty());
-        REQUIRE(ResourceManager::getResources().size() == 1 + resSize);
-        REQUIRE(ResourceManager::getResources()["test1"] == res2);
-        REQUIRE(ResourceManager::getOrphanedResources().empty() == true);
-        REQUIRE(ResourceManager::getDeletedResources().empty() == true);
-        res->decRef();
-        res->decRef();
-        REQUIRE(res->mRefCount == 0);
-    }
-
-    SECTION("resourcemanager getFromCache 2")
-    {
-        TestLoader rl = { "test1" };
-        Resource *res = ResourceManager::get("test1",
-            TestLoader::load, &rl);
-        REQUIRE(res != nullptr);
-        REQUIRE(testResouceCounter == 1);
-        REQUIRE(res->mRefCount == 1);
-        REQUIRE(ResourceManager::getResources().size() == 1 + resSize);
-        REQUIRE(ResourceManager::getResources()["test1"] == res);
-        REQUIRE(ResourceManager::getOrphanedResources().empty() == true);
-        REQUIRE(ResourceManager::getDeletedResources().empty() == true);
-        res->decRef();
-        REQUIRE(res->mRefCount == 0);
-        Resource *const res2 = ResourceManager::getFromCache("test1");
-        REQUIRE(res2 != nullptr);
-        REQUIRE(testResouceCounter == 1);
-        REQUIRE(res2->mRefCount == 1);
-        REQUIRE(res == res2);
-        REQUIRE(res2->mSource.empty());
-        REQUIRE(ResourceManager::getResources().size() == 1 + resSize);
-        REQUIRE(ResourceManager::getResources()["test1"] == res2);
-        REQUIRE(ResourceManager::getOrphanedResources().empty() == true);
-        REQUIRE(ResourceManager::getDeletedResources().empty() == true);
-        res->decRef();
-        REQUIRE(res->mRefCount == 0);
-    }
-
-    SECTION("resourcemanager getFromCache 3")
-    {
-        TestLoader rl = { "test1" };
-        Resource *res = ResourceManager::get("test1",
-            TestLoader::load, &rl);
-        REQUIRE(res != nullptr);
-        REQUIRE(testResouceCounter == 1);
-        REQUIRE(res->mRefCount == 1);
-        res->mSource = "source 1";
-        REQUIRE(ResourceManager::getResources().size() == 1 + resSize);
-        REQUIRE(ResourceManager::getResources()["test1"] == res);
-        REQUIRE(ResourceManager::getOrphanedResources().empty() == true);
-        REQUIRE(ResourceManager::getDeletedResources().empty() == true);
-
-        Resource *const res2 = ResourceManager::get("test2",
-            TestLoader::load, &rl);
-        REQUIRE(res2 != nullptr);
-        REQUIRE(testResouceCounter == 2);
-        REQUIRE(res2->mRefCount == 1);
-        REQUIRE(res2->mSource.empty());
-        REQUIRE(ResourceManager::getResources().size() == 2 + resSize);
-        REQUIRE(ResourceManager::getResources()["test1"] == res);
-        REQUIRE(ResourceManager::getResources()["test2"] == res2);
-        REQUIRE(ResourceManager::getOrphanedResources().empty() == true);
-        REQUIRE(ResourceManager::getDeletedResources().empty() == true);
-
-        Resource *const resC = ResourceManager::getFromCache("test1");
-        Resource *const res2C = ResourceManager::getFromCache("test2");
-        REQUIRE(resC != nullptr);
-        REQUIRE(res2C != nullptr);
-        REQUIRE(testResouceCounter == 2);
-        REQUIRE(res == resC);
-        REQUIRE(res2 == res2C);
-        REQUIRE(resC->mRefCount == 2);
-        REQUIRE(res2C->mRefCount == 2);
-        REQUIRE(ResourceManager::getResources().size() == 2 + resSize);
-        REQUIRE(ResourceManager::getResources()["test1"] == resC);
-        REQUIRE(ResourceManager::getResources()["test2"] == res2C);
-        REQUIRE(ResourceManager::getOrphanedResources().empty() == true);
-        REQUIRE(ResourceManager::getDeletedResources().empty() == true);
-
-        res->decRef();
-        res->decRef();
-        res2->decRef();
-        res2->decRef();
-        REQUIRE(res->mRefCount == 0);
-        REQUIRE(res2->mRefCount == 0);
-    }
-
-    SECTION("resourcemanager addResource 1")
-    {
-        REQUIRE(testResouceCounter == 0);
-        Resource *res = new TestResource();
-        REQUIRE(testResouceCounter == 1);
-        ResourceManager::addResource("test1", res);
-        REQUIRE(res != nullptr);
-        REQUIRE(res->mRefCount == 1);
-        REQUIRE(ResourceManager::getResources().size() == 1 + resSize);
-        REQUIRE(ResourceManager::getResources()["test1"] == res);
-        REQUIRE(ResourceManager::getOrphanedResources().empty() == true);
-        REQUIRE(ResourceManager::getDeletedResources().empty() == true);
-        res->decRef();
-        REQUIRE(res->mRefCount == 0);
-    }
-
-    SECTION("resourcemanager isInCache 1")
-    {
-        REQUIRE(testResouceCounter == 0);
-        TestLoader rl = { "test1" };
-        REQUIRE(ResourceManager::isInCache("test1") == false);
-        Resource *res = ResourceManager::get("test1",
-            TestLoader::load, &rl);
-        REQUIRE(ResourceManager::isInCache("test1") == true);
-        REQUIRE(ResourceManager::isInCache("test2") == false);
-        REQUIRE(testResouceCounter == 1);
-        REQUIRE(res != nullptr);
-        REQUIRE(res->mRefCount == 1);
-        REQUIRE(ResourceManager::getResources().size() == 1 + resSize);
-        REQUIRE(ResourceManager::getResources()["test1"] == res);
-        REQUIRE(ResourceManager::getOrphanedResources().empty() == true);
-        REQUIRE(ResourceManager::getDeletedResources().empty() == true);
-        res->decRef();
-        REQUIRE(res->mRefCount == 0);
-    }
-
-    SECTION("resourcemanager getTempResource 1")
-    {
-        TestLoader rl = { "test1" };
-        REQUIRE(ResourceManager::getTempResource("test1") == nullptr);
-        Resource *res = ResourceManager::get("test1",
-            TestLoader::load, &rl);
-        REQUIRE(res != nullptr);
-        REQUIRE(testResouceCounter == 1);
-        REQUIRE(res->mRefCount == 1);
-        REQUIRE(ResourceManager::getResources().size() == 1 + resSize);
-        REQUIRE(ResourceManager::getResources()["test1"] == res);
-        REQUIRE(ResourceManager::getOrphanedResources().empty() == true);
-        REQUIRE(ResourceManager::getDeletedResources().empty() == true);
-        Resource *const res2 = ResourceManager::getTempResource("test1");
-        REQUIRE(ResourceManager::getTempResource("test2") == nullptr);
-        REQUIRE(res2 != nullptr);
-        REQUIRE(testResouceCounter == 1);
-        REQUIRE(res2->mRefCount == 1);
-        REQUIRE(res == res2);
-        REQUIRE(res2->mSource.empty());
-        REQUIRE(ResourceManager::getResources().size() == 1 + resSize);
-        REQUIRE(ResourceManager::getResources()["test1"] == res2);
-        REQUIRE(ResourceManager::getOrphanedResources().empty() == true);
-        REQUIRE(ResourceManager::getDeletedResources().empty() == true);
-        res->decRef();
-        REQUIRE(res->mRefCount == 0);
-    }
-
-    SECTION("resourcemanager moveToDeleted 1")
-    {
-        REQUIRE(testResouceCounter == 0);
-        TestLoader rl = { "test1" };
-        Resource *res = ResourceManager::get("test1",
-            TestLoader::load, &rl);
-        REQUIRE(testResouceCounter == 1);
-        REQUIRE(res != nullptr);
-        REQUIRE(res->mRefCount == 1);
-        REQUIRE(ResourceManager::getResources().size() == 1 + resSize);
-        REQUIRE(ResourceManager::getResources()["test1"] == res);
-        REQUIRE(ResourceManager::getOrphanedResources().empty() == true);
-        REQUIRE(ResourceManager::getDeletedResources().empty() == true);
-        ResourceManager::moveToDeleted(res);
-        REQUIRE(testResouceCounter == 0);
-        REQUIRE(ResourceManager::getResources().size() == 0 + resSize);
-        REQUIRE(ResourceManager::getOrphanedResources().empty() == true);
-        REQUIRE(ResourceManager::getDeletedResources().empty() == true);
-    }
-
-    SECTION("resourcemanager moveToDeleted 2")
-    {
-        REQUIRE(testResouceCounter == 0);
-        TestLoader rl = { "test1" };
-        Resource *res = ResourceManager::get("test1",
-            TestLoader::load, &rl);
-        res->incRef();
-        REQUIRE(testResouceCounter == 1);
-        REQUIRE(res != nullptr);
-        REQUIRE(res->mRefCount == 2);
-        REQUIRE(ResourceManager::getResources().size() == 1 + resSize);
-        REQUIRE(ResourceManager::getResources()["test1"] == res);
-        REQUIRE(ResourceManager::getOrphanedResources().empty() == true);
-        REQUIRE(ResourceManager::getDeletedResources().empty() == true);
-        ResourceManager::moveToDeleted(res);
-        REQUIRE(testResouceCounter == 1);
-        REQUIRE(res->mRefCount == 1);
-        REQUIRE(ResourceManager::getResources().size() == 0 + resSize);
-        REQUIRE(ResourceManager::getOrphanedResources().empty() == true);
-        REQUIRE(ResourceManager::getDeletedResources().size() == 1);
-        res->decRef();
-    }
-
-    SECTION("resourcemanager moveToDeleted 3")
-    {
-        REQUIRE(testResouceCounter == 0);
-        TestLoader rl = { "test1" };
-        Resource *res = ResourceManager::get("test1",
-            TestLoader::load, &rl);
-        REQUIRE(testResouceCounter == 1);
-        REQUIRE(res != nullptr);
-        REQUIRE(res->mRefCount == 1);
-        REQUIRE(ResourceManager::getResources().size() == 1 + resSize);
-        REQUIRE(ResourceManager::getResources()["test1"] == res);
-        REQUIRE(ResourceManager::getOrphanedResources().empty() == true);
-        REQUIRE(ResourceManager::getDeletedResources().empty() == true);
-
-        res->decRef();
-        REQUIRE(testResouceCounter == 1);
-        REQUIRE(res->mRefCount == 0);
-        REQUIRE(ResourceManager::getResources().size() == 0 + resSize);
-        REQUIRE(ResourceManager::getOrphanedResources().size() == 1);
-        REQUIRE(ResourceManager::getOrphanedResources()["test1"] == res);
-        REQUIRE(ResourceManager::getDeletedResources().empty() == true);
-
-        ResourceManager::moveToDeleted(res);
-        REQUIRE(testResouceCounter == 0);
-        REQUIRE(ResourceManager::getResources().size() == 0 + resSize);
-        REQUIRE(ResourceManager::getOrphanedResources().empty() == true);
-        REQUIRE(ResourceManager::getDeletedResources().empty() == true);
-    }
-
-    SECTION("resourcemanager decRefDelete 1")
-    {
-        REQUIRE(testResouceCounter == 0);
-        TestLoader rl = { "test1" };
-        Resource *res = ResourceManager::get("test1",
-            TestLoader::load, &rl);
-        REQUIRE(testResouceCounter == 1);
-        REQUIRE(res != nullptr);
-        REQUIRE(res->mRefCount == 1);
-        REQUIRE(ResourceManager::getResources().size() == 1 + resSize);
-        REQUIRE(ResourceManager::getResources()["test1"] == res);
-        REQUIRE(ResourceManager::getOrphanedResources().empty() == true);
-        REQUIRE(ResourceManager::getDeletedResources().empty() == true);
-
-        ResourceManager::decRefDelete(res);
-        REQUIRE(testResouceCounter == 0);
-        REQUIRE(ResourceManager::getResources().size() == 0 + resSize);
-        REQUIRE(ResourceManager::getOrphanedResources().empty() == true);
-        REQUIRE(ResourceManager::getDeletedResources().empty() == true);
-    }
-
-    SECTION("resourcemanager cleanUp 1")
-    {
-        REQUIRE(testResouceCounter == 0);
-        TestLoader rl = { "test1" };
-        Resource *res = ResourceManager::get("test1",
-            TestLoader::load, &rl);
-        REQUIRE(testResouceCounter == 1);
-        REQUIRE(res != nullptr);
-        REQUIRE(res->mRefCount == 1);
-        REQUIRE(ResourceManager::getResources().size() == 1 + resSize);
-        REQUIRE(ResourceManager::getResources()["test1"] == res);
-        REQUIRE(ResourceManager::getOrphanedResources().empty() == true);
-        REQUIRE(ResourceManager::getDeletedResources().empty() == true);
-        res->decRef();
-
-        ResourceManager::cleanUp(res);
-        REQUIRE(testResouceCounter == 0);
-        REQUIRE(ResourceManager::getResources().size() == 0 + resSize);
-        REQUIRE(ResourceManager::getOrphanedResources().size() == 1);
-        REQUIRE(ResourceManager::getDeletedResources().empty() == true);
-        ResourceManager::getOrphanedResources().clear();
-    }
-
-    SECTION("resourcemanager cleanProtected 1")
-    {
-        REQUIRE(testResouceCounter == 0);
-        TestLoader rl = { "test1" };
-        Resource *res = ResourceManager::get("test1",
-            TestLoader::load, &rl);
-        REQUIRE(testResouceCounter == 1);
-        REQUIRE(res != nullptr);
-        REQUIRE(res->mRefCount == 1);
-        REQUIRE(ResourceManager::getResources().size() == 1 + resSize);
-        REQUIRE(ResourceManager::getResources()["test1"] == res);
-        REQUIRE(ResourceManager::getOrphanedResources().empty() == true);
-        REQUIRE(ResourceManager::getDeletedResources().empty() == true);
-        res->mProtected = true;
-        ResourceManager::cleanProtected();
-
-        REQUIRE(testResouceCounter == 1);
-        REQUIRE(ResourceManager::getResources().size() == 0 + resSize);
-        REQUIRE(ResourceManager::getOrphanedResources().size() == 1);
-        REQUIRE(ResourceManager::getOrphanedResources()["test1"] == res);
-        REQUIRE(ResourceManager::getDeletedResources().empty() == true);
-        res->decRef();
-    }
-
-    SECTION("resourcemanager clearDeleted 1")
-    {
-        REQUIRE(testResouceCounter == 0);
-        TestLoader rl = { "test1" };
-        Resource *res = ResourceManager::get("test1",
-            TestLoader::load, &rl);
-        res->incRef();
-        REQUIRE(testResouceCounter == 1);
-        REQUIRE(res != nullptr);
-        REQUIRE(res->mRefCount == 2);
-        REQUIRE(ResourceManager::getResources().size() == 1 + resSize);
-        REQUIRE(ResourceManager::getResources()["test1"] == res);
-        REQUIRE(ResourceManager::getOrphanedResources().empty() == true);
-        REQUIRE(ResourceManager::getDeletedResources().empty() == true);
-        ResourceManager::moveToDeleted(res);
-        REQUIRE(testResouceCounter == 1);
-        REQUIRE(res->mRefCount == 1);
-        REQUIRE(ResourceManager::getResources().size() == 0 + resSize);
-        REQUIRE(ResourceManager::getOrphanedResources().empty() == true);
-        REQUIRE(ResourceManager::getDeletedResources().size() == 1);
-
-        ResourceManager::clearDeleted();
-        REQUIRE(testResouceCounter == 1);
-        REQUIRE(res->mRefCount == 1);
-        REQUIRE(ResourceManager::getResources().size() == 0 + resSize);
-        REQUIRE(ResourceManager::getOrphanedResources().empty() == true);
-        REQUIRE(ResourceManager::getDeletedResources().size() == 1);
-        res->decRef();
-    }
-
-    SECTION("resourcemanager clearDeleted 2")
-    {
-        REQUIRE(testResouceCounter == 0);
-        TestLoader rl = { "test1" };
-        Resource *res = ResourceManager::get("test1",
-            TestLoader::load, &rl);
-        res->incRef();
-        REQUIRE(testResouceCounter == 1);
-        REQUIRE(res != nullptr);
-        REQUIRE(res->mRefCount == 2);
-        REQUIRE(ResourceManager::getResources().size() == 1 + resSize);
-        REQUIRE(ResourceManager::getResources()["test1"] == res);
-        REQUIRE(ResourceManager::getOrphanedResources().empty() == true);
-        REQUIRE(ResourceManager::getDeletedResources().empty() == true);
-        ResourceManager::moveToDeleted(res);
-        REQUIRE(testResouceCounter == 1);
-        REQUIRE(res->mRefCount == 1);
-        REQUIRE(ResourceManager::getResources().size() == 0 + resSize);
-        REQUIRE(ResourceManager::getOrphanedResources().empty() == true);
-        REQUIRE(ResourceManager::getDeletedResources().size() == 1);
-
-        res->decRef();
-        ResourceManager::clearDeleted();
-        REQUIRE(testResouceCounter == 0);
-        REQUIRE(ResourceManager::getResources().size() == 0 + resSize);
-        REQUIRE(ResourceManager::getOrphanedResources().empty() == true);
-        REQUIRE(ResourceManager::getDeletedResources().empty() == true);
-    }
-
-    delete2(userPalette);
-    delete2(theme);
-    delete2(client);
-    VirtFs::unmountDirSilent("data");
-    VirtFs::unmountDirSilent("../data");
-}
diff --git a/src/unittests/resources/sdlimagehelper.cc b/src/unittests/resources/sdlimagehelper.cc
deleted file mode 100644
index 931acbb88..000000000
--- a/src/unittests/resources/sdlimagehelper.cc
+++ /dev/null
@@ -1,559 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2014-2017  The ManaPlus Developers
- *
- *  This file is part of The ManaPlus Client.
- *
- *  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
- *  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, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef USE_SDL2
-#include "localconsts.h"
-PRAGMA48(GCC diagnostic push)
-PRAGMA48(GCC diagnostic ignored "-Wshadow")
-#include <SDL_endian.h>
-PRAGMA48(GCC diagnostic pop)
-#if SDL_BYTEORDER == SDL_LIL_ENDIAN
-
-#include "unittests/unittests.h"
-
-#include "client.h"
-#include "configmanager.h"
-#include "configuration.h"
-#include "dirs.h"
-#include "graphicsmanager.h"
-
-#include "being/actorsprite.h"
-
-#include "fs/virtfs/fs.h"
-
-#include "gui/userpalette.h"
-#include "gui/theme.h"
-
-#include "utils/delete2.h"
-#include "utils/env.h"
-
-#include "render/sdlgraphics.h"
-
-#include "resources/sdlimagehelper.h"
-
-#include "debug.h"
-
-static SDL_Surface *createSoftware32BitSurface(int width,
-                                               int height)
-{
-#if SDL_BYTEORDER == SDL_BIG_ENDIAN
-    const int rmask = 0xff000000;
-    const int gmask = 0x00ff0000;
-    const int bmask = 0x0000ff00;
-    const int amask = 0x000000ff;
-#else  // SDL_BYTEORDER == SDL_BIG_ENDIAN
-
-    const int rmask = 0x000000ff;
-    const int gmask = 0x0000ff00;
-    const int bmask = 0x00ff0000;
-    const int amask = 0xff000000;
-#endif  // SDL_BYTEORDER == SDL_BIG_ENDIAN
-
-    return MSDL_CreateRGBSurface(SDL_SWSURFACE,
-        width, height, 32, rmask, gmask, bmask, amask);
-}
-
-TEST_CASE("sdlimagehelper combineSurface", "")
-{
-    setEnv("SDL_VIDEODRIVER", "dummy");
-
-    client = new Client;
-    VirtFs::mountDirSilent("data", Append_false);
-    VirtFs::mountDirSilent("../data", Append_false);
-
-    mainGraphics = new SDLGraphics;
-    imageHelper = new SDLImageHelper;
-
-    Dirs::initRootDir();
-    Dirs::initHomeDir();
-
-    setBrandingDefaults(branding);
-    ConfigManager::initConfiguration();
-
-#ifdef USE_SDL2
-    SDLImageHelper::setRenderer(graphicsManager.createRenderer(
-        graphicsManager.createWindow(640, 480, 0,
-        SDL_WINDOW_SHOWN | SDL_SWSURFACE), SDL_RENDERER_SOFTWARE));
-#else  // USE_SDL2
-
-    graphicsManager.createWindow(640, 480, 0, SDL_ANYFORMAT | SDL_SWSURFACE);
-#endif  // USE_SDL2
-
-    userPalette = new UserPalette;
-
-    theme = new Theme;
-    Theme::selectSkin();
-
-    ActorSprite::load();
-
-    SECTION("empty copy1")
-    {
-        SDL_Surface *surface1 = createSoftware32BitSurface(2, 2);
-        uint32_t *ptr1 = static_cast<uint32_t*>(surface1->pixels);
-        for (int f = 0; f < 2 * 2; f ++)
-            ptr1[f] = 0xff000000;
-        SDL_Surface *surface2 = createSoftware32BitSurface(2, 2);
-        uint32_t *ptr2 = static_cast<uint32_t*>(surface2->pixels);
-
-        ptr2[0] = 0xff000000;
-        ptr2[1] = 0x00ff0000;
-        ptr2[2] = 0x0000ff00;
-        ptr2[3] = 0x000000ff;
-
-        SDLImageHelper::combineSurface(surface2,
-            nullptr,
-            surface1,
-            nullptr);
-
-        // src image test
-        REQUIRE(ptr2[0] == 0xff000000);
-        REQUIRE(ptr2[1] == 0x00ff0000);
-        REQUIRE(ptr2[2] == 0x0000ff00);
-        REQUIRE(ptr2[3] == 0x000000ff);
-
-        REQUIRE(ptr1[0] == 0xff000000);
-        REQUIRE(ptr1[1] == 0xff000000);
-        REQUIRE(ptr1[2] == 0xff000000);
-        REQUIRE(ptr1[3] == 0xff000000);
-        MSDL_FreeSurface(surface1);
-        MSDL_FreeSurface(surface2);
-    }
-
-    SECTION("empty copy2")
-    {
-        SDL_Surface *surface1 = createSoftware32BitSurface(2, 2);
-        uint32_t *ptr1 = static_cast<uint32_t*>(surface1->pixels);
-        for (int f = 0; f < 2 * 2; f ++)
-            ptr1[f] = 0xff000000;
-        SDL_Surface *surface2 = createSoftware32BitSurface(2, 2);
-        uint32_t *ptr2 = static_cast<uint32_t*>(surface2->pixels);
-
-        ptr2[0] = 0xff112233;
-        ptr2[1] = 0xff003344;
-        ptr2[2] = 0xff330055;
-        ptr2[3] = 0xff445500;
-
-        SDLImageHelper::combineSurface(surface2,
-            nullptr,
-            surface1,
-            nullptr);
-
-        REQUIRE(ptr1[0] == 0xff112233);
-        REQUIRE(ptr1[1] == 0xff003344);
-        REQUIRE(ptr1[2] == 0xff330055);
-        REQUIRE(ptr1[3] == 0xff445500);
-        MSDL_FreeSurface(surface1);
-        MSDL_FreeSurface(surface2);
-    }
-
-    SECTION("empty copy3")
-    {
-        SDL_Surface *surface1 = createSoftware32BitSurface(2, 2);
-        uint32_t *ptr1 = static_cast<uint32_t*>(surface1->pixels);
-        for (int f = 0; f < 2 * 2; f ++)
-            ptr1[f] = 0x00000000;
-        SDL_Surface *surface2 = createSoftware32BitSurface(2, 2);
-        uint32_t *ptr2 = static_cast<uint32_t*>(surface2->pixels);
-
-        ptr2[0] = 0xff112233;
-        ptr2[1] = 0xff003344;
-        ptr2[2] = 0xff330055;
-        ptr2[3] = 0xff445500;
-
-        SDLImageHelper::combineSurface(surface2,
-            nullptr,
-            surface1,
-            nullptr);
-
-        REQUIRE(ptr1[0] == 0xff112233);
-        REQUIRE(ptr1[1] == 0xff003344);
-        REQUIRE(ptr1[2] == 0xff330055);
-        REQUIRE(ptr1[3] == 0xff445500);
-        MSDL_FreeSurface(surface1);
-        MSDL_FreeSurface(surface2);
-    }
-
-    SECTION("empty copy4")
-    {
-        SDL_Surface *surface1 = createSoftware32BitSurface(2, 2);
-        uint32_t *ptr1 = static_cast<uint32_t*>(surface1->pixels);
-        for (int f = 0; f < 2 * 2; f ++)
-            ptr1[f] = 0xff000000;
-        SDL_Surface *surface2 = createSoftware32BitSurface(2, 2);
-        uint32_t *ptr2 = static_cast<uint32_t*>(surface2->pixels);
-
-        ptr2[0] = 0x50112233;
-        ptr2[1] = 0x50003344;
-        ptr2[2] = 0x50330055;
-        ptr2[3] = 0x50445500;
-
-        SDLImageHelper::combineSurface(surface2,
-            nullptr,
-            surface1,
-            nullptr);
-
-        REQUIRE(ptr1[0] == 0xff09121c);
-        REQUIRE(ptr1[1] == 0xff001c25);
-        REQUIRE(ptr1[2] == 0xff1c002f);
-        REQUIRE(ptr1[3] == 0xff252f00);
-        MSDL_FreeSurface(surface1);
-        MSDL_FreeSurface(surface2);
-    }
-
-    SECTION("empty copy5")
-    {
-        SDL_Surface *surface1 = createSoftware32BitSurface(2, 2);
-        uint32_t *ptr1 = static_cast<uint32_t*>(surface1->pixels);
-        for (int f = 0; f < 2 * 2; f ++)
-            ptr1[f] = 0x00000000;
-        SDL_Surface *surface2 = createSoftware32BitSurface(2, 2);
-        uint32_t *ptr2 = static_cast<uint32_t*>(surface2->pixels);
-
-        ptr2[0] = 0x50112233;
-        ptr2[1] = 0x50003344;
-        ptr2[2] = 0x50330055;
-        ptr2[3] = 0x50445500;
-
-        SDLImageHelper::combineSurface(surface2,
-            nullptr,
-            surface1,
-            nullptr);
-
-        REQUIRE(ptr1[0] == 0x8e09121c);
-        REQUIRE(ptr1[1] == 0x8e001c25);
-        REQUIRE(ptr1[2] == 0x8e1c002f);
-        REQUIRE(ptr1[3] == 0x8e252f00);
-        MSDL_FreeSurface(surface1);
-        MSDL_FreeSurface(surface2);
-    }
-
-    SECTION("empty copy6")
-    {
-        SDL_Surface *surface1 = createSoftware32BitSurface(2, 2);
-        uint32_t *ptr1 = static_cast<uint32_t*>(surface1->pixels);
-        ptr1[0] = 0x50112233;
-        ptr1[1] = 0x50003344;
-        ptr1[2] = 0x50330055;
-        ptr1[3] = 0x50445500;
-        SDL_Surface *surface2 = createSoftware32BitSurface(2, 2);
-        uint32_t *ptr2 = static_cast<uint32_t*>(surface2->pixels);
-
-        for (int f = 0; f < 2 * 2; f ++)
-            ptr2[f] = 0x00000000;
-
-        SDLImageHelper::combineSurface(surface2,
-            nullptr,
-            surface1,
-            nullptr);
-
-        REQUIRE(ptr1[0] == 0x50112233);
-        REQUIRE(ptr1[1] == 0x50003344);
-        REQUIRE(ptr1[2] == 0x50330055);
-        REQUIRE(ptr1[3] == 0x50445500);
-        MSDL_FreeSurface(surface1);
-        MSDL_FreeSurface(surface2);
-    }
-
-    SECTION("mix 1")
-    {
-        SDL_Surface *surface1 = createSoftware32BitSurface(2, 2);
-        uint32_t *ptr1 = static_cast<uint32_t*>(surface1->pixels);
-        ptr1[0] = 0x50112233;
-        ptr1[1] = 0x50003344;
-        ptr1[2] = 0x50330055;
-        ptr1[3] = 0x50445500;
-        SDL_Surface *surface2 = createSoftware32BitSurface(2, 2);
-        uint32_t *ptr2 = static_cast<uint32_t*>(surface2->pixels);
-
-        ptr2[0] = 0x50003344;
-        ptr2[1] = 0x50330055;
-        ptr2[2] = 0x50445500;
-        ptr2[3] = 0x50112233;
-
-        SDLImageHelper::combineSurface(surface2,
-            nullptr,
-            surface1,
-            nullptr);
-
-        REQUIRE(ptr1[0] == 0xdf082b3c);
-        REQUIRE(ptr1[1] == 0xdf1d174d);
-        REQUIRE(ptr1[2] == 0xdf3d2f26);
-        REQUIRE(ptr1[3] == 0xdf29391c);
-        MSDL_FreeSurface(surface1);
-        MSDL_FreeSurface(surface2);
-    }
-
-    SECTION("mix 2")
-    {
-        SDL_Surface *surface1 = createSoftware32BitSurface(2, 2);
-        uint32_t *ptr1 = static_cast<uint32_t*>(surface1->pixels);
-        ptr1[0] = 0x10112233;
-        ptr1[1] = 0x20003344;
-        ptr1[2] = 0x30330055;
-        ptr1[3] = 0x40445500;
-        SDL_Surface *surface2 = createSoftware32BitSurface(2, 2);
-        uint32_t *ptr2 = static_cast<uint32_t*>(surface2->pixels);
-
-        ptr2[0] = 0x50003344;
-        ptr2[1] = 0x60330055;
-        ptr2[2] = 0x70445500;
-        ptr2[3] = 0x80112233;
-
-        SDLImageHelper::combineSurface(surface2,
-            nullptr,
-            surface1,
-            nullptr);
-
-        REQUIRE(ptr1[0] == 0x9f082b3c);
-        REQUIRE(ptr1[1] == 0xbd1f144e);
-        REQUIRE(ptr1[2] == 0xb93f391e);
-        REQUIRE(ptr1[3] == 0xf5213224);
-        MSDL_FreeSurface(surface1);
-        MSDL_FreeSurface(surface2);
-    }
-
-    SECTION("part mix 1")
-    {
-// 11 11 00 00
-// 11 11 00 00
-// 00 00 00 00
-// 00 00 00 00
-
-        SDL_Surface *surface1 = createSoftware32BitSurface(4, 4);
-        uint32_t *ptr1 = static_cast<uint32_t*>(surface1->pixels);
-        ptr1[0] = 0x10112233;
-        ptr1[1] = 0x20003344;
-        ptr1[2] = 0x10203040;
-        ptr1[3] = 0x20304050;
-        ptr1[4] = 0x30330055;
-        ptr1[5] = 0x40445500;
-        ptr1[6] = 0x30405060;
-        ptr1[7] = 0x708090a0;
-
-        ptr1[8] = 0x8090a0b0;
-        ptr1[9] = 0x90a0b0c0;
-        ptr1[10] = 0xa0b0c0d0;
-        ptr1[11] = 0xb0c0d0e0;
-        ptr1[12] = 0xc0d0e0f0;
-        ptr1[13] = 0xd0e0f000;
-        ptr1[14] = 0xe0f00010;
-        ptr1[15] = 0xf0001020;
-
-        SDL_Surface *surface2 = createSoftware32BitSurface(2, 2);
-        uint32_t *ptr2 = static_cast<uint32_t*>(surface2->pixels);
-
-        ptr2[0] = 0x50003344;
-        ptr2[1] = 0x60330055;
-        ptr2[2] = 0x70445500;
-        ptr2[3] = 0x80112233;
-
-        SDLImageHelper::combineSurface(surface2,
-            nullptr,
-            surface1,
-            nullptr);
-
-        REQUIRE(ptr1[0] == 0x9f082b3c);
-        REQUIRE(ptr1[1] == 0xbd1f144e);
-        REQUIRE(ptr1[2] == 0x10203040);
-        REQUIRE(ptr1[3] == 0x20304050);
-        REQUIRE(ptr1[4] == 0xb93f391e);
-        REQUIRE(ptr1[5] == 0xf5213224);
-        REQUIRE(ptr1[6] == 0x30405060);
-        REQUIRE(ptr1[7] == 0x708090a0);
-
-        REQUIRE(ptr1[8] == 0x8090a0b0);
-        REQUIRE(ptr1[9] == 0x90a0b0c0);
-        REQUIRE(ptr1[10] == 0xa0b0c0d0);
-        REQUIRE(ptr1[11] == 0xb0c0d0e0);
-        REQUIRE(ptr1[12] == 0xc0d0e0f0);
-        REQUIRE(ptr1[13] == 0xd0e0f000);
-        REQUIRE(ptr1[14] == 0xe0f00010);
-        REQUIRE(ptr1[15] == 0xf0001020);
-
-        MSDL_FreeSurface(surface1);
-        MSDL_FreeSurface(surface2);
-    }
-
-    SECTION("part mix 2")
-    {
-// 00 00 00 00
-// 00 11 11 00
-// 00 11 11 00
-// 00 00 00 00
-
-        SDL_Surface *surface1 = createSoftware32BitSurface(4, 4);
-        uint32_t *ptr1 = static_cast<uint32_t*>(surface1->pixels);
-
-        ptr1[0] = 0x10203040;
-        ptr1[1] = 0x20304050;
-        ptr1[2] = 0x30405060;
-        ptr1[3] = 0x708090a0;
-        ptr1[4] = 0x8090a0b0;
-
-        ptr1[5] = 0x10112233;  // +
-        ptr1[6] = 0x20003344;  // +
-
-        ptr1[7] = 0x90a0b0c0;
-        ptr1[8] = 0xa0b0c0d0;
-
-        ptr1[9] = 0x30330055;  // +
-        ptr1[10] = 0x40445500;  // +
-
-        ptr1[11] = 0xb0c0d0e0;
-        ptr1[12] = 0xc0d0e0f0;
-        ptr1[13] = 0xd0e0f000;
-        ptr1[14] = 0xe0f00010;
-        ptr1[15] = 0xf0001020;
-
-        SDL_Surface *surface2 = createSoftware32BitSurface(2, 2);
-        uint32_t *ptr2 = static_cast<uint32_t*>(surface2->pixels);
-
-        ptr2[0] = 0x50003344;
-        ptr2[1] = 0x60330055;
-        ptr2[2] = 0x70445500;
-        ptr2[3] = 0x80112233;
-
-        SDL_Rect rect1;
-        SDL_Rect rect2;
-        rect1.x = 1;
-        rect1.y = 1;
-        rect1.w = 2;
-        rect1.h = 2;
-        rect2.x = 0;
-        rect2.y = 0;
-        rect2.w = 2;
-        rect2.h = 2;
-        SDLImageHelper::combineSurface(surface2,
-            &rect2,
-            surface1,
-            &rect1);
-
-        REQUIRE(ptr1[0] == 0x10203040);
-        REQUIRE(ptr1[1] == 0x20304050);
-        REQUIRE(ptr1[2] == 0x30405060);
-        REQUIRE(ptr1[3] == 0x708090a0);
-        REQUIRE(ptr1[4] == 0x8090a0b0);
-
-        REQUIRE(ptr1[5] == 0x9f082b3c);  // +
-        REQUIRE(ptr1[6] == 0xbd1f144e);  // +
-
-        REQUIRE(ptr1[7] == 0x90a0b0c0);
-        REQUIRE(ptr1[8] == 0xa0b0c0d0);
-
-        REQUIRE(ptr1[9] == 0xb93f391e);  // +
-        REQUIRE(ptr1[10] == 0xf5213224);  // +
-
-        REQUIRE(ptr1[11] == 0xb0c0d0e0);
-        REQUIRE(ptr1[12] == 0xc0d0e0f0);
-        REQUIRE(ptr1[13] == 0xd0e0f000);
-        REQUIRE(ptr1[14] == 0xe0f00010);
-        REQUIRE(ptr1[15] == 0xf0001020);
-
-        MSDL_FreeSurface(surface1);
-        MSDL_FreeSurface(surface2);
-    }
-
-    SECTION("part mix 3")
-    {
-        SDL_Surface *surface1 = createSoftware32BitSurface(4, 4);
-        uint32_t *ptr1 = static_cast<uint32_t*>(surface1->pixels);
-
-        ptr1[0] = 0x10203040;
-        ptr1[1] = 0x20304050;
-        ptr1[2] = 0x30405060;
-        ptr1[3] = 0x708090a0;
-        ptr1[4] = 0x8090a0b0;
-        ptr1[5] = 0x10112233;
-        ptr1[6] = 0x20003344;
-        ptr1[7] = 0x90a0b0c0;
-        ptr1[8] = 0xa0b0c0d0;
-        ptr1[9] = 0x30330055;
-        ptr1[10] = 0x40445500;
-        ptr1[11] = 0xb0c0d0e0;
-        ptr1[12] = 0xc0d0e0f0;
-        ptr1[13] = 0xd0e0f000;
-        ptr1[14] = 0xe0f00010;
-        ptr1[15] = 0xf0001020;
-
-        SDL_Surface *surface2 = createSoftware32BitSurface(4, 4);
-        uint32_t *ptr2 = static_cast<uint32_t*>(surface2->pixels);
-
-        ptr2[0] = 0x50003344;
-        ptr2[1] = 0x60330055;
-        ptr2[2] = 0x70445500;
-        ptr2[3] = 0x80112233;
-        ptr2[4] = 0x90111111;
-        ptr2[5] = 0x90111111;
-        ptr2[6] = 0xff000000;
-        ptr2[7] = 0xff000000;
-        ptr2[8] = 0xff000000;
-        ptr2[9] = 0xff000000;
-        ptr2[10] = 0xff000000;
-        ptr2[11] = 0xff000000;
-        ptr2[12] = 0xff000000;
-        ptr2[13] = 0xff000000;
-        ptr2[14] = 0xff000000;
-        ptr2[15] = 0xff000000;
-
-        SDL_Rect rect1;
-        SDL_Rect rect2;
-        rect1.x = 1;
-        rect1.y = 1;
-        rect1.w = 2;
-        rect1.h = 2;
-        rect2.x = 0;
-        rect2.y = 0;
-        rect2.w = 2;
-        rect2.h = 2;
-        SDLImageHelper::combineSurface(surface2,
-            &rect2,
-            surface1,
-            &rect1);
-
-        REQUIRE(ptr1[0] == 0x10203040);
-        REQUIRE(ptr1[1] == 0x20304050);
-        REQUIRE(ptr1[2] == 0x30405060);
-        REQUIRE(ptr1[3] == 0x708090a0);
-        REQUIRE(ptr1[4] == 0x8090a0b0);
-        REQUIRE(ptr1[5] == 0x9f082b3c);
-        REQUIRE(ptr1[6] == 0xbd1f144e);
-        REQUIRE(ptr1[7] == 0x90a0b0c0);
-        REQUIRE(ptr1[8] == 0xa0b0c0d0);
-        REQUIRE(ptr1[9] == 0xbf1b0d23);
-        REQUIRE(ptr1[10] == 0xff1f230c);
-        REQUIRE(ptr1[11] == 0xb0c0d0e0);
-        REQUIRE(ptr1[12] == 0xc0d0e0f0);
-        REQUIRE(ptr1[13] == 0xd0e0f000);
-        REQUIRE(ptr1[14] == 0xe0f00010);
-        REQUIRE(ptr1[15] == 0xf0001020);
-
-        MSDL_FreeSurface(surface1);
-        MSDL_FreeSurface(surface2);
-    }
-
-    delete2(userPalette);
-    delete2(theme);
-    delete2(client);
-    VirtFs::unmountDirSilent("data");
-    VirtFs::unmountDirSilent("../data");
-}
-
-#endif  // SDL_BYTEORDER == SDL_LIL_ENDIAN
-#endif  // USE_SDL2
diff --git a/src/unittests/resources/sprite/animatedsprite.cc b/src/unittests/resources/sprite/animatedsprite.cc
deleted file mode 100644
index c97afeeda..000000000
--- a/src/unittests/resources/sprite/animatedsprite.cc
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2013-2017  The ManaPlus Developers
- *
- *  This file is part of The ManaPlus Client.
- *
- *  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
- *  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, see <http://www.gnu.org/licenses/>.
- */
-
-#include "unittests/unittests.h"
-
-#include "configuration.h"
-#include "configmanager.h"
-#include "client.h"
-#include "dirs.h"
-#include "graphicsmanager.h"
-
-#include "const/resources/spriteaction.h"
-
-#include "being/actorsprite.h"
-
-#include "fs/virtfs/fs.h"
-
-#include "gui/gui.h"
-#include "gui/theme.h"
-
-#include "render/sdlgraphics.h"
-
-#include "resources/sdlimagehelper.h"
-
-#include "resources/animation/animation.h"
-
-#include "resources/sprite/animatedsprite.h"
-
-#include "utils/env.h"
-#include "utils/delete2.h"
-#include "utils/mrand.h"
-
-PRAGMA48(GCC diagnostic push)
-PRAGMA48(GCC diagnostic ignored "-Wshadow")
-#ifndef USE_SDL2
-#include <SDL.h>
-#endif  // USE_SDL2
-PRAGMA48(GCC diagnostic pop)
-
-#include "debug.h"
-
-TEST_CASE("AnimatedSprite tests", "animatedsprite")
-{
-    setEnv("SDL_VIDEODRIVER", "dummy");
-
-    initRand();
-    client = new Client;
-    XML::initXML();
-    SDL_Init(SDL_INIT_VIDEO);
-    VirtFs::mountDirSilent("data", Append_false);
-    VirtFs::mountDirSilent("../data", Append_false);
-    mainGraphics = new SDLGraphics;
-    imageHelper = new SDLImageHelper();
-
-    Dirs::initRootDir();
-    Dirs::initHomeDir();
-
-    ConfigManager::initConfiguration();
-    setConfigDefaults2(config);
-    setBrandingDefaults(branding);
-
-#ifdef USE_SDL2
-    SDLImageHelper::setRenderer(graphicsManager.createRenderer(
-        graphicsManager.createWindow(640, 480, 0,
-        SDL_WINDOW_SHOWN | SDL_SWSURFACE), SDL_RENDERER_SOFTWARE));
-#else  // USE_SDL2
-
-    graphicsManager.createWindow(640, 480, 0, SDL_ANYFORMAT | SDL_SWSURFACE);
-#endif  // USE_SDL2
-
-    theme = new Theme;
-    Theme::selectSkin();
-
-    ActorSprite::load();
-    gui = new Gui();
-    gui->postInit(mainGraphics);
-
-    SECTION("basic test 1")
-    {
-        AnimatedSprite *sprite = AnimatedSprite::load(
-            "graphics/sprites/error.xml", 0);
-        sprite->play(SpriteAction::DEFAULT);
-
-        REQUIRE_FALSE(sprite == nullptr);
-        REQUIRE_FALSE(sprite->getSprite() == nullptr);
-        REQUIRE_FALSE(sprite->getAnimation() == nullptr);
-        REQUIRE_FALSE(sprite->getFrame() == nullptr);
-        REQUIRE(0 == sprite->getFrameIndex());
-        REQUIRE(0 == sprite->getFrameTime());
-        REQUIRE(false == sprite->update(1));
-        REQUIRE(0 == sprite->getFrameTime());
-        REQUIRE(false == sprite->update(11));
-        REQUIRE(10 == sprite->getFrameTime());
-        REQUIRE(0 == sprite->getFrameIndex());
-        delete sprite;
-        logger->log("test4");
-    }
-
-    SECTION("basic test 2")
-    {
-        AnimatedSprite *sprite = AnimatedSprite::load(
-            "graphics/sprites/test.xml", 0);
-        sprite->play(SpriteAction::STAND);
-
-        REQUIRE(10 == const_cast<Animation*>(sprite->getAnimation())
-            ->getFrames().size());
-
-        REQUIRE_FALSE(nullptr == sprite);
-
-        REQUIRE(false == sprite->update(1));
-        REQUIRE(0 == sprite->getFrameTime());
-        REQUIRE(10 == sprite->getFrame()->delay);
-
-        REQUIRE(false == sprite->update(1 + 10));
-        REQUIRE(0 == sprite->getFrameIndex());
-        REQUIRE(10 == sprite->getFrameTime());
-
-        REQUIRE(true == sprite->update(1 + 10 + 5));
-        REQUIRE(1 == sprite->getFrameIndex());
-        REQUIRE(5 == sprite->getFrameTime());
-
-        REQUIRE(false == sprite->update(1 + 10 + 5));
-        REQUIRE(1 == sprite->getFrameIndex());
-        REQUIRE(5 == sprite->getFrameTime());
-
-        REQUIRE(false == sprite->update(1 + 10 + 20));
-        REQUIRE(1 == sprite->getFrameIndex());
-        REQUIRE(20 == sprite->getFrameTime());
-
-        REQUIRE(true == sprite->update(1 + 10 + 20 + 1));
-        REQUIRE(2 == sprite->getFrameIndex());
-        REQUIRE(1 == sprite->getFrameTime());
-
-        REQUIRE(false == sprite->update(1 + 10 + 20 + 10));
-        REQUIRE(2 == sprite->getFrameIndex());
-        REQUIRE(10 == sprite->getFrameTime());
-
-        REQUIRE(true == sprite->update(1 + 10 + 20 + 10 + 1));
-        REQUIRE(4 == sprite->getFrameIndex());
-        REQUIRE(1 == sprite->getFrameTime());
-
-        REQUIRE(false == sprite->update(1 + 10 + 20 + 10 + 25));
-        REQUIRE(4 == sprite->getFrameIndex());
-        REQUIRE(25 == sprite->getFrameTime());
-
-        REQUIRE(true == sprite->update(1 + 10 + 20 + 10 + 25 + 1));
-        REQUIRE(6 == sprite->getFrameIndex());
-        REQUIRE(1 == sprite->getFrameTime());
-
-        REQUIRE(true == sprite->update(1 + 10 + 20 + 10 + 25 + 10 + 1));
-        REQUIRE(8 == sprite->getFrameIndex());
-        REQUIRE(1 == sprite->getFrameTime());
-
-        REQUIRE(true == sprite->update(1 + 10 + 20 + 10 + 25 + 10 + 10 + 1));
-        REQUIRE(4 == sprite->getFrameIndex());
-        REQUIRE(1 == sprite->getFrameTime());
-        delete sprite;
-    }
-
-    SECTION("basic test 3")
-    {
-        AnimatedSprite *sprite2 = AnimatedSprite::load(
-            "graphics/sprites/test.xml", 0);
-        sprite2->play(SpriteAction::SIT);
-
-        REQUIRE(false == sprite2->update(1));
-        REQUIRE(2 == const_cast<Animation*>(sprite2->getAnimation())
-            ->getFrames().size());
-        REQUIRE(0 == sprite2->getFrameTime());
-        REQUIRE(85 == sprite2->getFrame()->delay);
-
-        REQUIRE(true == sprite2->update(1 + 10 + 20 + 10 + 25 + 10 + 10 + 1));
-        REQUIRE(1 == sprite2->getFrameIndex());
-        REQUIRE(1 == sprite2->getFrameTime());
-        delete sprite2;
-    }
-
-    delete2(client);
-    VirtFs::unmountDirSilent("data");
-    VirtFs::unmountDirSilent("../data");
-}
diff --git a/src/unittests/sdl.cc b/src/unittests/sdl.cc
deleted file mode 100644
index 8502eeed6..000000000
--- a/src/unittests/sdl.cc
+++ /dev/null
@@ -1,405 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2013-2017  The ManaPlus Developers
- *
- *  This file is part of The ManaPlus Client.
- *
- *  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
- *  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, see <http://www.gnu.org/licenses/>.
- */
-
-#include "unittests/unittests.h"
-
-#include "configmanager.h"
-#include "configuration.h"
-#include "client.h"
-#include "dirs.h"
-#include "graphicsmanager.h"
-
-#include "being/actorsprite.h"
-
-#include "fs/files.h"
-
-#include "fs/virtfs/fs.h"
-
-#include "gui/userpalette.h"
-#include "gui/theme.h"
-
-#include "resources/sdlimagehelper.h"
-#ifdef USE_SDL2
-#include "resources/surfaceimagehelper.h"
-#endif  // USE_SDL2
-
-#include "resources/resourcemanager/resourcemanager.h"
-
-#include "utils/env.h"
-#include "utils/delete2.h"
-
-#ifndef USE_SDL2
-PRAGMA48(GCC diagnostic push)
-PRAGMA48(GCC diagnostic ignored "-Wshadow")
-#include <SDL_image.h>
-PRAGMA48(GCC diagnostic pop)
-#endif  // USE_SDL2
-
-#include "debug.h"
-
-TEST_CASE("sdl tests", "sdl")
-{
-    setEnv("SDL_VIDEODRIVER", "dummy");
-
-    client = new Client;
-    XML::initXML();
-    SDL_Init(SDL_INIT_VIDEO);
-    std::string name("data/test/test.zip");
-    std::string prefix;
-    if (Files::existsLocal(name) == false)
-        prefix = "../" + prefix;
-
-    VirtFs::mountDirSilent("data", Append_false);
-    VirtFs::mountDirSilent("../data", Append_false);
-
-    Dirs::initRootDir();
-    Dirs::initHomeDir();
-
-    setBrandingDefaults(branding);
-    ConfigManager::initConfiguration();
-
-#ifdef USE_SDL2
-    imageHelper = new SurfaceImageHelper;
-
-    SDLImageHelper::setRenderer(graphicsManager.createRenderer(
-        graphicsManager.createWindow(640, 480, 0,
-        SDL_WINDOW_SHOWN | SDL_SWSURFACE), SDL_RENDERER_SOFTWARE));
-#else  // USE_SDL2
-
-    imageHelper = new SDLImageHelper();
-
-    graphicsManager.createWindow(640, 480, 0, SDL_ANYFORMAT | SDL_SWSURFACE);
-#endif  // USE_SDL2
-
-    userPalette = new UserPalette;
-    config.setValue("fontSize", 16);
-
-    theme = new Theme;
-    Theme::selectSkin();
-
-    ActorSprite::load();
-
-    SECTION("sdl SDL DuplicateSurface1")
-    {
-#if SDL_BYTEORDER == SDL_BIG_ENDIAN
-        const int rmask = 0xff000000;
-        const int gmask = 0x00ff0000;
-        const int bmask = 0x0000ff00;
-        const int amask = 0x000000ff;
-#else  // SDL_BYTEORDER == SDL_BIG_ENDIAN
-
-        const int rmask = 0x000000ff;
-        const int gmask = 0x0000ff00;
-        const int bmask = 0x00ff0000;
-        const int amask = 0xff000000;
-#endif  // SDL_BYTEORDER == SDL_BIG_ENDIAN
-
-        SDL_Surface *const surface = SDL_CreateRGBSurface(SDL_HWSURFACE,
-            10, 10, 32, rmask, gmask, bmask, amask);
-        uint32_t *ptr = reinterpret_cast<uint32_t*>(surface->pixels);
-        for (int f = 0; f < 100; f ++)
-        {
-            ptr[f] = 300 * f;
-        }
-#ifdef USE_SDL2
-        SDL_Surface *surface2 = SurfaceImageHelper::SDLDuplicateSurface(
-            surface);
-#else  // USE_SDL2
-
-        SDL_Surface *surface2 = SDLImageHelper::SDLDuplicateSurface(
-            surface);
-#endif  // USE_SDL2
-
-        uint32_t *ptr2 = reinterpret_cast<uint32_t*>(surface2->pixels);
-        for (int f = 0; f < 100; f ++)
-        {
-            REQUIRE(ptr[f] == ptr2[f]);
-        }
-
-        SDL_FreeSurface(surface);
-        SDL_FreeSurface(surface2);
-    }
-
-    SECTION("sdl SDL DuplicateSurface2")
-    {
-#if SDL_BYTEORDER == SDL_BIG_ENDIAN
-        const int rmask = 0x000000ff;
-        const int gmask = 0x0000ff00;
-        const int bmask = 0x00ff0000;
-        const int amask = 0xff000000;
-#else  // SDL_BYTEORDER == SDL_BIG_ENDIAN
-
-        const int rmask = 0xff000000;
-        const int gmask = 0x00ff0000;
-        const int bmask = 0x0000ff00;
-        const int amask = 0x000000ff;
-#endif  // SDL_BYTEORDER == SDL_BIG_ENDIAN
-
-        SDL_Surface *const surface = SDL_CreateRGBSurface(SDL_HWSURFACE,
-            10, 10, 32, rmask, gmask, bmask, amask);
-        uint32_t *ptr = reinterpret_cast<uint32_t*>(surface->pixels);
-        for (int f = 0; f < 100; f ++)
-        {
-            ptr[f] = 300 * f;
-        }
-#ifdef USE_SDL2
-        SDL_Surface *surface2 = SurfaceImageHelper::SDLDuplicateSurface(
-            surface);
-#else  // USE_SDL2
-
-        SDL_Surface *surface2 = SDLImageHelper::SDLDuplicateSurface(
-            surface);
-#endif  // USE_SDL2
-
-        uint32_t *ptr2 = reinterpret_cast<uint32_t*>(surface2->pixels);
-        for (int f = 0; f < 100; f ++)
-        {
-            REQUIRE(ptr[f] == ptr2[f]);
-        }
-
-        SDL_FreeSurface(surface);
-        SDL_FreeSurface(surface2);
-    }
-
-    SECTION("sdl SDL_ConvertSurface1")
-    {
-#if SDL_BYTEORDER == SDL_BIG_ENDIAN
-        const int rmask = 0xff000000;
-        const int gmask = 0x00ff0000;
-        const int bmask = 0x0000ff00;
-        const int amask = 0x000000ff;
-#else  // SDL_BYTEORDER == SDL_BIG_ENDIAN
-
-        const int rmask = 0x000000ff;
-        const int gmask = 0x0000ff00;
-        const int bmask = 0x00ff0000;
-        const int amask = 0xff000000;
-#endif  // SDL_BYTEORDER == SDL_BIG_ENDIAN
-
-        SDL_Surface *const surface = SDL_CreateRGBSurface(SDL_HWSURFACE,
-            4, 4, 32, rmask, gmask, bmask, amask);
-        uint32_t *ptr = reinterpret_cast<uint32_t*>(surface->pixels);
-        ptr[0] = 0x11223344;
-        ptr[1] = 0x22334455;
-        ptr[2] = 0x33445566;
-        ptr[3] = 0x44556677;
-        ptr[4] = 0x55667788;
-        ptr[5] = 0x66778899;
-        ptr[6] = 0x778899aa;
-        ptr[7] = 0x8899aabb;
-        ptr[8] = 0x99aabbcc;
-        ptr[9] = 0xaabbccdd;
-        ptr[10] = 0xbbccddee;
-        ptr[11] = 0xccddeeff;
-        ptr[12] = 0xff000000;
-        ptr[13] = 0x00ff0000;
-        ptr[14] = 0x0000ff00;
-        ptr[15] = 0x000000ff;
-
-        SDL_PixelFormat rgba;
-        rgba.palette = nullptr;
-        rgba.BitsPerPixel = 32;
-        rgba.BytesPerPixel = 4;
-
-#if SDL_BYTEORDER == SDL_BIG_ENDIAN
-        rgba.Rmask = 0x000000FF;
-        rgba.Gmask = 0x0000FF00;
-        rgba.Bmask = 0x00FF0000;
-        rgba.Amask = 0xFF000000;
-#else  // SDL_BYTEORDER == SDL_BIG_ENDIAN
-
-        rgba.Rmask = 0xFF000000;
-        rgba.Gmask = 0x00FF0000;
-        rgba.Bmask = 0x0000FF00;
-        rgba.Amask = 0x000000FF;
-#endif  // SDL_BYTEORDER == SDL_BIG_ENDIAN
-
-        SDL_Surface *const surface2 = MSDL_ConvertSurface(
-            surface, &rgba, SDL_SWSURFACE);
-
-        uint32_t *ptr2 = reinterpret_cast<uint32_t*>(surface2->pixels);
-        REQUIRE(ptr2[0] == 0x44332211);
-        REQUIRE(ptr2[1] == 0x55443322);
-        REQUIRE(ptr2[2] == 0x66554433);
-        REQUIRE(ptr2[3] == 0x77665544);
-        REQUIRE(ptr2[4] == 0x88776655);
-        REQUIRE(ptr2[5] == 0x99887766);
-        REQUIRE(ptr2[6] == 0xaa998877);
-        REQUIRE(ptr2[7] == 0xbbaa9988);
-        REQUIRE(ptr2[8] == 0xccbbaa99);
-        REQUIRE(ptr2[9] == 0xddccbbaa);
-        REQUIRE(ptr2[10] == 0xeeddccbb);
-        REQUIRE(ptr2[11] == 0xffeeddcc);
-        REQUIRE(ptr2[12] == 0x000000ff);
-        REQUIRE(ptr2[13] == 0x0000ff00);
-        REQUIRE(ptr2[14] == 0x00ff0000);
-        REQUIRE(ptr2[15] == 0xff000000);
-
-        SDL_FreeSurface(surface);
-        SDL_FreeSurface(surface2);
-    }
-
-    SECTION("sdl SDL_ConvertSurface2")
-    {
-#if SDL_BYTEORDER == SDL_BIG_ENDIAN
-        const int rmask = 0x000000ff;
-        const int gmask = 0x0000ff00;
-        const int bmask = 0x00ff0000;
-        const int amask = 0xff000000;
-#else  // SDL_BYTEORDER == SDL_BIG_ENDIAN
-
-        const int rmask = 0xff000000;
-        const int gmask = 0x00ff0000;
-        const int bmask = 0x0000ff00;
-        const int amask = 0x000000ff;
-#endif  // SDL_BYTEORDER == SDL_BIG_ENDIAN
-
-        SDL_Surface *const surface = SDL_CreateRGBSurface(SDL_HWSURFACE,
-            4, 4, 32, rmask, gmask, bmask, amask);
-        uint32_t *ptr = reinterpret_cast<uint32_t*>(surface->pixels);
-        ptr[0] = 0x11223344;
-        ptr[1] = 0x22334455;
-        ptr[2] = 0x33445566;
-        ptr[3] = 0x44556677;
-        ptr[4] = 0x55667788;
-        ptr[5] = 0x66778899;
-        ptr[6] = 0x778899aa;
-        ptr[7] = 0x8899aabb;
-        ptr[8] = 0x99aabbcc;
-        ptr[9] = 0xaabbccdd;
-        ptr[10] = 0xbbccddee;
-        ptr[11] = 0xccddeeff;
-        ptr[12] = 0xff000000;
-        ptr[13] = 0x00ff0000;
-        ptr[14] = 0x0000ff00;
-        ptr[15] = 0x000000ff;
-
-        SDL_PixelFormat rgba;
-        rgba.palette = nullptr;
-        rgba.BitsPerPixel = 32;
-        rgba.BytesPerPixel = 4;
-
-#if SDL_BYTEORDER == SDL_BIG_ENDIAN
-        rgba.Rmask = 0xFF000000;
-        rgba.Gmask = 0x00FF0000;
-        rgba.Bmask = 0x0000FF00;
-        rgba.Amask = 0x000000FF;
-#else  // SDL_BYTEORDER == SDL_BIG_ENDIAN
-
-        rgba.Rmask = 0x000000FF;
-        rgba.Gmask = 0x0000FF00;
-        rgba.Bmask = 0x00FF0000;
-        rgba.Amask = 0xFF000000;
-#endif  // SDL_BYTEORDER == SDL_BIG_ENDIAN
-
-        SDL_Surface *const surface2 = MSDL_ConvertSurface(
-            surface, &rgba, SDL_SWSURFACE);
-
-        uint32_t *ptr2 = reinterpret_cast<uint32_t*>(surface2->pixels);
-        REQUIRE(ptr2[0] == 0x44332211);
-        REQUIRE(ptr2[1] == 0x55443322);
-        REQUIRE(ptr2[2] == 0x66554433);
-        REQUIRE(ptr2[3] == 0x77665544);
-        REQUIRE(ptr2[4] == 0x88776655);
-        REQUIRE(ptr2[5] == 0x99887766);
-        REQUIRE(ptr2[6] == 0xaa998877);
-        REQUIRE(ptr2[7] == 0xbbaa9988);
-        REQUIRE(ptr2[8] == 0xccbbaa99);
-        REQUIRE(ptr2[9] == 0xddccbbaa);
-        REQUIRE(ptr2[10] == 0xeeddccbb);
-        REQUIRE(ptr2[11] == 0xffeeddcc);
-        REQUIRE(ptr2[12] == 0x000000ff);
-        REQUIRE(ptr2[13] == 0x0000ff00);
-        REQUIRE(ptr2[14] == 0x00ff0000);
-        REQUIRE(ptr2[15] == 0xff000000);
-
-        SDL_FreeSurface(surface);
-        SDL_FreeSurface(surface2);
-    }
-
-    SECTION("sdl SDL_ConvertSurface3")
-    {
-        const int rmask = 0x000000ff;
-        const int gmask = 0x0000ff00;
-        const int bmask = 0x00ff0000;
-        const int amask = 0xff000000;
-
-        SDL_Surface *const surface = SDL_CreateRGBSurface(SDL_HWSURFACE,
-            4, 4, 32, rmask, gmask, bmask, amask);
-        uint32_t *ptr = reinterpret_cast<uint32_t*>(surface->pixels);
-        ptr[0] = 0x11223344;
-        ptr[1] = 0x22334455;
-        ptr[2] = 0x33445566;
-        ptr[3] = 0x44556677;
-        ptr[4] = 0x55667788;
-        ptr[5] = 0x66778899;
-        ptr[6] = 0x778899aa;
-        ptr[7] = 0x8899aabb;
-        ptr[8] = 0x99aabbcc;
-        ptr[9] = 0xaabbccdd;
-        ptr[10] = 0xbbccddee;
-        ptr[11] = 0xccddeeff;
-        ptr[12] = 0xff000000;
-        ptr[13] = 0x00ff0000;
-        ptr[14] = 0x0000ff00;
-        ptr[15] = 0x000000ff;
-
-        SDL_PixelFormat rgba;
-        rgba.palette = nullptr;
-        rgba.BitsPerPixel = 32;
-        rgba.BytesPerPixel = 4;
-        rgba.Rmask = 0x000000FF;
-        rgba.Gmask = 0x0000FF00;
-        rgba.Bmask = 0x00FF0000;
-        rgba.Amask = 0xFF000000;
-
-        SDL_Surface *const surface2 = MSDL_ConvertSurface(
-            surface, &rgba, SDL_SWSURFACE);
-
-        uint32_t *ptr2 = reinterpret_cast<uint32_t*>(surface2->pixels);
-        REQUIRE(ptr2[0] == 0x11223344);
-        REQUIRE(ptr2[1] == 0x22334455);
-        REQUIRE(ptr2[2] == 0x33445566);
-        REQUIRE(ptr2[3] == 0x44556677);
-        REQUIRE(ptr2[4] == 0x55667788);
-        REQUIRE(ptr2[5] == 0x66778899);
-        REQUIRE(ptr2[6] == 0x778899aa);
-        REQUIRE(ptr2[7] == 0x8899aabb);
-        REQUIRE(ptr2[8] == 0x99aabbcc);
-        REQUIRE(ptr2[9] == 0xaabbccdd);
-        REQUIRE(ptr2[10] == 0xbbccddee);
-        REQUIRE(ptr2[11] == 0xccddeeff);
-        REQUIRE(ptr2[12] == 0xff000000);
-        REQUIRE(ptr2[13] == 0x00ff0000);
-        REQUIRE(ptr2[14] == 0x0000ff00);
-        REQUIRE(ptr2[15] == 0x000000ff);
-
-        SDL_FreeSurface(surface);
-        SDL_FreeSurface(surface2);
-    }
-
-    ResourceManager::cleanOrphans(true);
-    delete2(userPalette);
-    delete2(theme);
-    delete2(client);
-
-    VirtFs::unmountDirSilent("data");
-    VirtFs::unmountDirSilent("../data");
-}
diff --git a/src/unittests/unittests.h b/src/unittests/unittests.h
deleted file mode 100644
index 672b2ca54..000000000
--- a/src/unittests/unittests.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2017  The ManaPlus Developers
- *
- *  This file is part of The ManaPlus Client.
- *
- *  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
- *  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, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef UNITTESTS_H
-#define UNITTESTS_H
-
-#include "localconsts.h"
-
-#ifdef UNITTESTS_CATCH
-#include "unittests/catch.hpp"
-#endif  // UNITTESTS_CATCH
-
-#ifdef UNITTESTS_DOCTEST
-
-#ifdef __GNUC__
-#if GCC_VERSION >= 50000
-#define PRAGMA5(str) _Pragma(#str)
-#elif defined(__clang__)
-#define PRAGMA5(str) _Pragma(#str)
-#else  // GCC_VERSION > 50000
-#define PRAGMA5(str)
-#endif  // GCC_VERSION > 50000
-#endif  // __GNUC__
-
-PRAGMA5(GCC diagnostic push)
-PRAGMA5(GCC diagnostic ignored "-Wsuggest-override")
-#include "unittests/doctest.h"
-PRAGMA5(GCC diagnostic pop)
-
-#undef TEST_CASE
-#define TEST_CASE(name, tags) DOCTEST_TEST_CASE(name " " tags)
-#define SECTION(name) DOCTEST_SUBCASE(name)
-#endif  // UNITTESTS_DOCTEST
-
-#endif  // UNITTESTS_H
diff --git a/src/unittests/utils/chatutils.cc b/src/unittests/utils/chatutils.cc
deleted file mode 100644
index 82e8379be..000000000
--- a/src/unittests/utils/chatutils.cc
+++ /dev/null
@@ -1,265 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2012-2017  The ManaPlus Developers
- *
- *  This file is part of The ManaPlus Client.
- *
- *  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
- *  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, see <http://www.gnu.org/licenses/>.
- */
-
-#include "unittests/unittests.h"
-
-#include "client.h"
-#include "configuration.h"
-#include "configmanager.h"
-#include "dirs.h"
-
-#include "actormanager.h"
-#include "graphicsmanager.h"
-#include "party.h"
-
-#include "being/localplayer.h"
-
-#include "fs/virtfs/fs.h"
-
-#include "gui/gui.h"
-#include "gui/theme.h"
-
-#include "utils/chatutils.h"
-#include "utils/delete2.h"
-#include "utils/env.h"
-
-#include "render/sdlgraphics.h"
-
-#include "resources/sdlimagehelper.h"
-
-PRAGMA48(GCC diagnostic push)
-PRAGMA48(GCC diagnostic ignored "-Wshadow")
-#ifndef USE_SDL2
-#include <SDL.h>
-#endif  // USE_SDL2
-PRAGMA48(GCC diagnostic pop)
-
-#include "debug.h"
-
-TEST_CASE("chatutils replaceVars", "")
-{
-    setEnv("SDL_VIDEODRIVER", "dummy");
-
-    client = new Client;
-    XML::initXML();
-    SDL_Init(SDL_INIT_VIDEO);
-    VirtFs::mountDirSilent("data", Append_false);
-    VirtFs::mountDirSilent("../data", Append_false);
-    imageHelper = new SDLImageHelper();
-    mainGraphics = new SDLGraphics;
-
-    Dirs::initRootDir();
-    Dirs::initHomeDir();
-
-    ConfigManager::initConfiguration();
-    setConfigDefaults2(config);
-    setBrandingDefaults(branding);
-
-#ifdef USE_SDL2
-    SDLImageHelper::setRenderer(graphicsManager.createRenderer(
-        graphicsManager.createWindow(640, 480, 0,
-        SDL_WINDOW_SHOWN | SDL_SWSURFACE), SDL_RENDERER_SOFTWARE));
-#else  // USE_SDL2
-
-    graphicsManager.createWindow(640, 480, 0, SDL_ANYFORMAT | SDL_SWSURFACE);
-#endif  // USE_SDL2
-
-    theme = new Theme;
-    Theme::selectSkin();
-
-    gui = new Gui();
-    gui->postInit(mainGraphics);
-
-    ActorSprite::load();
-    localPlayer = new LocalPlayer(static_cast<BeingId>(1),
-        BeingTypeId_zero);
-    actorManager = new ActorManager;
-    std::string str;
-
-    SECTION("empty")
-    {
-        replaceVars(str);
-        REQUIRE(str.empty());
-
-        str = "test line";
-        replaceVars(str);
-        REQUIRE(str == "test line");
-
-        str = "test <PLAYER>";
-        replaceVars(str);
-        REQUIRE(str == "test ");
-
-        str = "test <MONSTER>";
-        replaceVars(str);
-        REQUIRE(str == "test ");
-
-        str = "test <PEOPLE>";
-        replaceVars(str);
-        REQUIRE(str == "test ");
-
-        str = "test <PARTY>";
-        replaceVars(str);
-        REQUIRE(str == "test ");
-
-        str = "test <SOMETHING>";
-        replaceVars(str);
-        REQUIRE(str == "test <SOMETHING>");
-    }
-
-    SECTION("player")
-    {
-        Being *player1 = Being::createBeing(static_cast<BeingId>(2),
-            ActorType::Player,
-            BeingTypeId_zero,
-            nullptr);
-        player1->setName("player1");
-        actorManager->mActors.insert(player1);
-
-        localPlayer->setTarget(player1);
-        str = "test <PLAYER>";
-        replaceVars(str);
-        REQUIRE(str == "test player1");
-    }
-
-    SECTION("monster")
-    {
-        Being *const monster = Being::createBeing(static_cast<BeingId>(3),
-            ActorType::Monster,
-            BeingTypeId_zero,
-            nullptr);
-        monster->setName("monster1");
-        actorManager->mActors.insert(monster);
-
-        localPlayer->setTarget(monster);
-        str = "test <MONSTER>";
-        replaceVars(str);
-        REQUIRE(str == "test monster1");
-    }
-
-    SECTION("people")
-    {
-        actorManager->mActors.insert(localPlayer);
-        str = "test <PEOPLE>";
-        replaceVars(str);
-        REQUIRE(str == "test ");
-
-        Being *const player1 = Being::createBeing(static_cast<BeingId>(2),
-            ActorType::Player,
-            BeingTypeId_zero,
-            nullptr);
-        player1->setName("player1");
-        actorManager->mActors.insert(player1);
-
-        str = "test <PEOPLE>";
-        replaceVars(str);
-        REQUIRE(str == "test player1");
-
-        Being *const player2 = Being::createBeing(static_cast<BeingId>(4),
-            ActorType::Player,
-            BeingTypeId_zero,
-            nullptr);
-        player2->setName("player2");
-        actorManager->mActors.insert(player2);
-
-        str = "test <PEOPLE>";
-        replaceVars(str);
-        const bool correct = str == "test player1,player2" ||
-            str == "test player2,player1";
-        REQUIRE(correct == true);
-    }
-
-    SECTION("party")
-    {
-        actorManager->mActors.insert(localPlayer);
-
-        Party *const party1 = Party::getParty(1);
-        localPlayer->setParty(party1);
-
-        str = "test <PARTY>";
-        replaceVars(str);
-        REQUIRE(str == "test ");
-
-        Being *const player1 = Being::createBeing(static_cast<BeingId>(2),
-            ActorType::Player,
-            BeingTypeId_zero,
-            nullptr);
-        player1->setName("player1");
-        actorManager->mActors.insert(player1);
-        player1->setParty(party1);
-
-        str = "test <PARTY>";
-        replaceVars(str);
-        REQUIRE(str == "test player1");
-
-        Being *const player2 = Being::createBeing(static_cast<BeingId>(4),
-            ActorType::Player,
-            BeingTypeId_zero,
-            nullptr);
-        player2->setName("player2");
-        actorManager->mActors.insert(player2);
-        player2->setParty(party1);
-
-        str = "test <PARTY>";
-        replaceVars(str);
-        REQUIRE(str == "test player1,player2");
-
-        Party *const party2 = Party::getParty(2);
-
-        Being *const player3 = Being::createBeing(static_cast<BeingId>(5),
-            ActorType::Player,
-            BeingTypeId_zero,
-            nullptr);
-        player3->setName("player3");
-        actorManager->mActors.insert(player3);
-        player3->setParty(party2);
-
-        str = "test <PARTY>";
-        replaceVars(str);
-        REQUIRE(str == "test player1,player2");
-
-        player3->setParty(party1);
-
-        str = "test <PARTY>";
-        replaceVars(str);
-        REQUIRE(str == "test player1,player2,player3");
-
-        player2->setParty(party2);
-
-        str = "test <PARTY>";
-        replaceVars(str);
-        REQUIRE(str == "test player1,player3");
-
-        Party::clearParties();
-    }
-
-    delete2(actorManager);
-    delete2(localPlayer);
-    delete2(client);
-    VirtFs::unmountDirSilent("data");
-    VirtFs::unmountDirSilent("../data");
-}
-
-TEST_CASE("chatutils textToMe", "")
-{
-    REQUIRE(textToMe("") == "**");
-    REQUIRE(textToMe("123") == "*123*");
-    REQUIRE(textToMe("*") == "***");
-    REQUIRE(textToMe("test line") == "*test line*");
-}
diff --git a/src/unittests/utils/checkutils.cc b/src/unittests/utils/checkutils.cc
deleted file mode 100644
index 5cfec4e83..000000000
--- a/src/unittests/utils/checkutils.cc
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2016-2017  The ManaPlus Developers
- *
- *  This file is part of The ManaPlus Client.
- *
- *  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
- *  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, see <http://www.gnu.org/licenses/>.
- */
-
-#include "unittests/unittests.h"
-
-#include "utils/checkutils.h"
-
-#include "debug.h"
-
-namespace
-{
-    bool flag = false;
-}  // namespace
-
-static void testReturnFalseV(const bool val)
-{
-    flag = false;
-    returnFalseVReal(val);
-    flag = true;
-}
-
-static void testReturnTrueV(const bool val)
-{
-    flag = false;
-    returnTrueVReal(val);
-    flag = true;
-}
-
-static int testReturnFalse(const bool val)
-{
-    returnFalseReal(0, val);
-    return 1;
-}
-
-static int testReturnTrue(const bool val)
-{
-    returnTrueReal(0, val);
-    return 1;
-}
-
-static int testReturnNullptr(void *val)
-{
-    returnNullptrReal(0, val);
-    return 1;
-}
-
-static void testReturnNullptrV(void *val)
-{
-    flag = false;
-    returnNullptrVReal(val);
-    flag = true;
-}
-
-static bool testFailAlways1()
-{
-    failAlways("test fail");
-    return false;
-}
-
-static bool testFailAlways2()
-{
-    reportAlways("test fail");
-    return false;
-}
-
-TEST_CASE("CheckUtils", "")
-{
-    SECTION("reportFalse")
-    {
-        REQUIRE(reportFalseReal(false) == false);
-        REQUIRE(reportFalseReal(true) == true);
-    }
-
-    SECTION("reportTrue")
-    {
-        REQUIRE(reportTrueReal(false) == false);
-        REQUIRE(reportTrueReal(true) == true);
-    }
-
-    SECTION("reportAlways")
-    {
-        reportAlwaysReal("test report");
-    }
-
-    SECTION("failFalse")
-    {
-PRAGMA4(GCC diagnostic push)
-PRAGMA4(GCC diagnostic ignored "-Wunused-value")
-        REQUIRE_THROWS(failFalse(false));
-        REQUIRE(failFalse(true) == true);
-        REQUIRE_THROWS(reportFalse(false));
-        REQUIRE(reportFalse(true) == true);
-PRAGMA4(GCC diagnostic pop)
-    }
-
-    SECTION("failTrue")
-    {
-PRAGMA4(GCC diagnostic push)
-PRAGMA4(GCC diagnostic ignored "-Wunused-value")
-        REQUIRE(failTrue(false) == false);
-        REQUIRE_THROWS(failTrue(true));
-        REQUIRE(reportTrue(false) == false);
-        REQUIRE_THROWS(reportTrue(true));
-PRAGMA4(GCC diagnostic pop)
-    }
-
-    SECTION("failAlways")
-    {
-PRAGMA4(GCC diagnostic push)
-PRAGMA4(GCC diagnostic ignored "-Wunused-value")
-        REQUIRE_THROWS(testFailAlways1());
-        REQUIRE_THROWS(testFailAlways2());
-PRAGMA4(GCC diagnostic pop)
-    }
-
-    SECTION("returnFalseV")
-    {
-        testReturnFalseV(false);
-        REQUIRE(flag == false);
-        testReturnFalseV(true);
-        REQUIRE(flag == true);
-    }
-
-    SECTION("returnTrueV")
-    {
-        testReturnTrueV(false);
-        REQUIRE(flag == true);
-        testReturnTrueV(true);
-        REQUIRE(flag == false);
-    }
-
-    SECTION("returnFalse")
-    {
-        REQUIRE(testReturnFalse(false) == 0);
-        REQUIRE(testReturnFalse(true) == 1);
-    }
-
-    SECTION("returnTrue")
-    {
-        REQUIRE(testReturnTrue(false) == 1);
-        REQUIRE(testReturnTrue(true) == 0);
-    }
-
-    SECTION("returnNullptr")
-    {
-        REQUIRE(testReturnNullptr(nullptr) == 0);
-        REQUIRE(testReturnNullptr(reinterpret_cast<void*>(1)) == 1);
-    }
-
-    SECTION("returnNullptrV")
-    {
-        testReturnNullptrV(nullptr);
-        REQUIRE(flag == false);
-        testReturnNullptrV(reinterpret_cast<void*>(1));
-        REQUIRE(flag == true);
-    }
-}
diff --git a/src/unittests/utils/dumplibs.cc b/src/unittests/utils/dumplibs.cc
deleted file mode 100644
index e5797d45f..000000000
--- a/src/unittests/utils/dumplibs.cc
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2017  The ManaPlus Developers
- *
- *  This file is part of The ManaPlus Client.
- *
- *  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
- *  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, see <http://www.gnu.org/licenses/>.
- */
-
-#include "unittests/unittests.h"
-
-#include "utils/stringutils.h"
-
-PRAGMA48(GCC diagnostic push)
-PRAGMA48(GCC diagnostic ignored "-Wshadow")
-#include <SDL_image.h>
-#include <SDL_mixer.h>
-PRAGMACLANG6GCC(GCC diagnostic push)
-PRAGMACLANG6GCC(GCC diagnostic ignored "-Wold-style-cast")
-#include <SDL_net.h>
-PRAGMACLANG6GCC(GCC diagnostic pop)
-#include <SDL_ttf.h>
-PRAGMA48(GCC diagnostic pop)
-
-#include <zlib.h>
-
-#include "debug.h"
-
-TEST_CASE("dumplibs tests", "")
-{
-    SECTION("zlib")
-    {
-        const std::string build = ZLIB_VERSION;
-        const std::string link = zlibVersion();
-        REQUIRE(build == link);
-    }
-
-    SECTION("sdl")
-    {
-        const SDL_version *linkVersion = nullptr;
-#ifdef USE_SDL2
-        SDL_version sdlVersion;
-        sdlVersion.major = 0;
-        sdlVersion.minor = 0;
-        sdlVersion.patch = 0;
-        SDL_GetVersion(&sdlVersion);
-        linkVersion = &sdlVersion;
-#else  // USE_SDL2
-        linkVersion = SDL_Linked_Version();
-#endif  // USE_SDL2
-
-        const std::string build = strprintf("%d.%d.%d",
-            SDL_MAJOR_VERSION,
-            SDL_MINOR_VERSION,
-            SDL_PATCHLEVEL);
-        const std::string link = strprintf("%d.%d.%d",
-            linkVersion->major,
-            linkVersion->minor,
-            linkVersion->patch);
-
-        REQUIRE(build == link);
-    }
-
-    SECTION("sdl_net")
-    {
-        const SDL_version *const linkVersion = SDLNet_Linked_Version();
-
-        const std::string build = strprintf("%d.%d.%d",
-            SDL_NET_MAJOR_VERSION,
-            SDL_NET_MINOR_VERSION,
-            SDL_NET_PATCHLEVEL);
-        const std::string link = strprintf("%d.%d.%d",
-            linkVersion->major,
-            linkVersion->minor,
-            linkVersion->patch);
-
-        REQUIRE(build == link);
-    }
-
-    SECTION("sdl_image")
-    {
-        const SDL_version *const linkVersion = IMG_Linked_Version();
-
-        const std::string build = strprintf("%d.%d.%d",
-            SDL_IMAGE_MAJOR_VERSION,
-            SDL_IMAGE_MINOR_VERSION,
-            SDL_IMAGE_PATCHLEVEL);
-        const std::string link = strprintf("%d.%d.%d",
-            linkVersion->major,
-            linkVersion->minor,
-            linkVersion->patch);
-
-        REQUIRE(build == link);
-    }
-
-    SECTION("sdl_mixer")
-    {
-        const SDL_version *const linkVersion = Mix_Linked_Version();
-
-        const std::string build = strprintf("%d.%d.%d",
-            SDL_MIXER_MAJOR_VERSION,
-            SDL_MIXER_MINOR_VERSION,
-            SDL_MIXER_PATCHLEVEL);
-        const std::string link = strprintf("%d.%d.%d",
-            linkVersion->major,
-            linkVersion->minor,
-            linkVersion->patch);
-
-        REQUIRE(build == link);
-    }
-
-    SECTION("sdl_ttf")
-    {
-        const SDL_version *const linkVersion = TTF_Linked_Version();
-
-        const std::string build = strprintf("%d.%d.%d",
-            SDL_TTF_MAJOR_VERSION,
-            SDL_TTF_MINOR_VERSION,
-            SDL_TTF_PATCHLEVEL);
-        const std::string link = strprintf("%d.%d.%d",
-            linkVersion->major,
-            linkVersion->minor,
-            linkVersion->patch);
-
-        REQUIRE(build == link);
-    }
-}
diff --git a/src/unittests/utils/langs.cc b/src/unittests/utils/langs.cc
deleted file mode 100644
index d9ff6eded..000000000
--- a/src/unittests/utils/langs.cc
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2013-2017  The ManaPlus Developers
- *
- *  This file is part of The ManaPlus Client.
- *
- *  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
- *  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, see <http://www.gnu.org/licenses/>.
- */
-
-#include "unittests/unittests.h"
-
-#include "configuration.h"
-
-#include "utils/env.h"
-#include "utils/langs.h"
-
-#include "debug.h"
-
-TEST_CASE("Langs getLang", "")
-{
-    LangVect langs;
-
-    config.setValue("lang", "C");
-    langs = getLang();
-    REQUIRE(langs.size() == 1);
-    REQUIRE(langs[0] == "C");
-
-    config.setValue("lang", "ru_RU");
-    langs = getLang();
-    REQUIRE(langs.size() == 2);
-    REQUIRE(langs[0] == "ru_RU");
-    REQUIRE(langs[1] == "ru");
-
-    config.setValue("lang", "ru_RU.UTF-8");
-    langs = getLang();
-    REQUIRE(langs.size() == 2);
-    REQUIRE(langs[0] == "ru_RU");
-    REQUIRE(langs[1] == "ru");
-
-    config.setValue("lang", "");
-
-    setEnv("LANG", "C");
-    langs = getLang();
-    REQUIRE(langs.size() == 1);
-    REQUIRE(langs[0] == "C");
-
-    setEnv("LANG", "ru_RU");
-    langs = getLang();
-    REQUIRE(langs.size() == 2);
-    REQUIRE(langs[0] == "ru_RU");
-    REQUIRE(langs[1] == "ru");
-
-    setEnv("LANG", "ru_RU.UTF-8");
-    langs = getLang();
-    REQUIRE(langs.size() == 2);
-    REQUIRE(langs[0] == "ru_RU");
-    REQUIRE(langs[1] == "ru");
-}
-
-TEST_CASE("Langs getLangSimple", "")
-{
-    config.setValue("lang", "C");
-    REQUIRE(getLangSimple() == "C");
-
-    config.setValue("lang", "ru_RU");
-    REQUIRE(getLangSimple() == "ru_RU");
-
-    config.setValue("lang", "ru_RU.UTF-8");
-    REQUIRE(getLangSimple() == "ru_RU.UTF-8");
-
-    config.setValue("lang", "");
-
-    setEnv("LANG", "C");
-    REQUIRE(getLangSimple() == "C");
-
-    setEnv("LANG", "ru_RU");
-    REQUIRE(getLangSimple() == "ru_RU");
-
-    setEnv("LANG", "ru_RU.UTF-8");
-    REQUIRE(getLangSimple() == "ru_RU.UTF-8");
-}
-
-TEST_CASE("Langs getLangShort", "")
-{
-    config.setValue("lang", "C");
-    REQUIRE(getLangShort() == "C");
-
-    config.setValue("lang", "ru_RU");
-    REQUIRE(getLangShort() == "ru");
-
-    config.setValue("lang", "ru_RU.UTF-8");
-    REQUIRE(getLangShort() == "ru");
-
-    config.setValue("lang", "");
-
-    setEnv("LANG", "C");
-    REQUIRE(getLangShort() == "C");
-
-    setEnv("LANG", "ru_RU");
-    REQUIRE(getLangShort() == "ru");
-
-    setEnv("LANG", "ru_RU.UTF-8");
-    REQUIRE(getLangShort() == "ru");
-}
diff --git a/src/unittests/utils/mathutils.cc b/src/unittests/utils/mathutils.cc
deleted file mode 100644
index 3eb0214ef..000000000
--- a/src/unittests/utils/mathutils.cc
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2013-2017  The ManaPlus Developers
- *
- *  This file is part of The ManaPlus Client.
- *
- *  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
- *  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, see <http://www.gnu.org/licenses/>.
- */
-
-#include "unittests/unittests.h"
-
-#include "utils/mathutils.h"
-
-#include "debug.h"
-
-TEST_CASE("MathUtils powerOfTwo", "")
-{
-    REQUIRE(powerOfTwo(0) == 1);
-    REQUIRE(powerOfTwo(1) == 1);
-    REQUIRE(powerOfTwo(2) == 2);
-    REQUIRE(powerOfTwo(3) == 4);
-    REQUIRE(powerOfTwo(4) == 4);
-    REQUIRE(powerOfTwo(5) == 8);
-    REQUIRE(powerOfTwo(6) == 8);
-    REQUIRE(powerOfTwo(7) == 8);
-    REQUIRE(powerOfTwo(8) == 8);
-    REQUIRE(powerOfTwo(9) == 16);
-    REQUIRE(powerOfTwo(10) == 16);
-    REQUIRE(powerOfTwo(11) == 16);
-    REQUIRE(powerOfTwo(12) == 16);
-    REQUIRE(powerOfTwo(13) == 16);
-    REQUIRE(powerOfTwo(14) == 16);
-    REQUIRE(powerOfTwo(15) == 16);
-    REQUIRE(powerOfTwo(16) == 16);
-    REQUIRE(powerOfTwo(17) == 32);
-    REQUIRE(powerOfTwo(18) == 32);
-    REQUIRE(powerOfTwo(19) == 32);
-    REQUIRE(powerOfTwo(20) == 32);
-    REQUIRE(powerOfTwo(21) == 32);
-    REQUIRE(powerOfTwo(22) == 32);
-    REQUIRE(powerOfTwo(23) == 32);
-    REQUIRE(powerOfTwo(24) == 32);
-    REQUIRE(powerOfTwo(25) == 32);
-    REQUIRE(powerOfTwo(26) == 32);
-    REQUIRE(powerOfTwo(27) == 32);
-    REQUIRE(powerOfTwo(28) == 32);
-    REQUIRE(powerOfTwo(29) == 32);
-    REQUIRE(powerOfTwo(30) == 32);
-    REQUIRE(powerOfTwo(31) == 32);
-    REQUIRE(powerOfTwo(32) == 32);
-    REQUIRE(powerOfTwo(33) == 64);
-    REQUIRE(powerOfTwo(34) == 64);
-    REQUIRE(powerOfTwo(35) == 64);
-    REQUIRE(powerOfTwo(36) == 64);
-    REQUIRE(powerOfTwo(37) == 64);
-    REQUIRE(powerOfTwo(38) == 64);
-    REQUIRE(powerOfTwo(39) == 64);
-    REQUIRE(powerOfTwo(41) == 64);
-    REQUIRE(powerOfTwo(42) == 64);
-    REQUIRE(powerOfTwo(43) == 64);
-    REQUIRE(powerOfTwo(44) == 64);
-    REQUIRE(powerOfTwo(45) == 64);
-    REQUIRE(powerOfTwo(46) == 64);
-    REQUIRE(powerOfTwo(47) == 64);
-    REQUIRE(powerOfTwo(48) == 64);
-    REQUIRE(powerOfTwo(49) == 64);
-    REQUIRE(powerOfTwo(50) == 64);
-    REQUIRE(powerOfTwo(51) == 64);
-    REQUIRE(powerOfTwo(52) == 64);
-    REQUIRE(powerOfTwo(53) == 64);
-    REQUIRE(powerOfTwo(54) == 64);
-    REQUIRE(powerOfTwo(55) == 64);
-    REQUIRE(powerOfTwo(56) == 64);
-    REQUIRE(powerOfTwo(57) == 64);
-    REQUIRE(powerOfTwo(58) == 64);
-    REQUIRE(powerOfTwo(59) == 64);
-    REQUIRE(powerOfTwo(60) == 64);
-    REQUIRE(powerOfTwo(61) == 64);
-    REQUIRE(powerOfTwo(62) == 64);
-    REQUIRE(powerOfTwo(63) == 64);
-    REQUIRE(powerOfTwo(64) == 64);
-    REQUIRE(powerOfTwo(65) == 128);
-
-    REQUIRE(powerOfTwo(1000000) == 1048576);
-}
-
-TEST_CASE("MathUtils tests fastSqrtInt", "")
-{
-    for (int f = 0; f < 1005; f ++)
-        REQUIRE(fastSqrtInt(f) == CAST_S32(sqrt(f)));
-}
diff --git a/src/unittests/utils/parameters.cc b/src/unittests/utils/parameters.cc
deleted file mode 100644
index 90d872d5a..000000000
--- a/src/unittests/utils/parameters.cc
+++ /dev/null
@@ -1,327 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2012-2017  The ManaPlus Developers
- *
- *  This file is part of The ManaPlus Client.
- *
- *  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
- *  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, see <http://www.gnu.org/licenses/>.
- */
-
-#include "unittests/unittests.h"
-
-#include "utils/parameters.h"
-
-#include "debug.h"
-
-TEST_CASE("parameters basic 1", "")
-{
-    StringVect pars;
-    REQUIRE(splitParameters(pars, "", ",", '\"') == true);
-    REQUIRE(pars.empty());
-}
-
-TEST_CASE("parameters basic 2", "")
-{
-    StringVect pars;
-    REQUIRE(splitParameters(pars, "one,two, tree", ",", '\"') == true);
-    REQUIRE(pars.size() == 3);
-    REQUIRE(pars[0] == "one");
-    REQUIRE(pars[1] == "two");
-    REQUIRE(pars[2] == "tree");
-}
-
-TEST_CASE("parameters basic 3", "")
-{
-    StringVect pars;
-    REQUIRE(splitParameters(pars, ", ,,,", ",", '\"') == true);
-    REQUIRE(pars.empty());
-}
-
-TEST_CASE("parameters basic 4", "")
-{
-    StringVect pars;
-    REQUIRE(splitParameters(pars, "one,,two, tree", ",", '\"') == true);
-    REQUIRE(pars.size() == 3);
-    REQUIRE(pars[0] == "one");
-    REQUIRE(pars[1] == "two");
-    REQUIRE(pars[2] == "tree");
-}
-
-TEST_CASE("parameters escape 1", "")
-{
-    StringVect pars;
-    REQUIRE(splitParameters(pars, "\\\"", ",", '\"') == true);
-    REQUIRE(pars.size() == 1);
-    REQUIRE(pars[0] == "\"");
-}
-
-TEST_CASE("parameters escape 2", "")
-{
-    StringVect pars;
-    REQUIRE(splitParameters(pars, "\\\", test", ",", '\"') == true);
-    REQUIRE(pars.size() == 2);
-    REQUIRE(pars[0] == "\"");
-    REQUIRE(pars[1] == "test");
-}
-
-TEST_CASE("parameters escape 3", "")
-{
-    StringVect pars;
-    REQUIRE(splitParameters(pars, "test,\\\"", ",", '\"') == true);
-    REQUIRE(pars.size() == 2);
-    REQUIRE(pars[0] == "test");
-    REQUIRE(pars[1] == "\"");
-}
-
-TEST_CASE("parameters quote 1", "")
-{
-    StringVect pars;
-    REQUIRE(splitParameters(pars, "\"one\",,two, tree", ",", '\"') == true);
-    REQUIRE(pars.size() == 3);
-    REQUIRE(pars[0] == "one");
-    REQUIRE(pars[1] == "two");
-    REQUIRE(pars[2] == "tree");
-}
-
-TEST_CASE("parameters quote 2", "")
-{
-    StringVect pars;
-    REQUIRE(splitParameters(pars, "\"\",,two, tree", ",", '\"') == true);
-    REQUIRE(pars.size() == 3);
-    REQUIRE(pars[0].empty());
-    REQUIRE(pars[1] == "two");
-    REQUIRE(pars[2] == "tree");
-}
-
-TEST_CASE("parameters quote 3", "")
-{
-    StringVect pars;
-    REQUIRE(splitParameters(pars, "\"one test\",,two, tree", ",", '\"') ==
-        true);
-    REQUIRE(pars.size() == 3);
-    REQUIRE(pars[0] == "one test");
-    REQUIRE(pars[1] == "two");
-    REQUIRE(pars[2] == "tree");
-}
-
-TEST_CASE("parameters quote 4", "")
-{
-    StringVect pars;
-    REQUIRE(splitParameters(pars, "\"\\\"one test\\\"\",,two, tree", ",", '\"')
-        == true);
-    REQUIRE(pars.size() == 3);
-    REQUIRE(pars[0] == "\"one test\"");
-    REQUIRE(pars[1] == "two");
-    REQUIRE(pars[2] == "tree");
-}
-
-TEST_CASE("parameters quote 5", "")
-{
-    StringVect pars;
-    REQUIRE(splitParameters(pars, "\"\\\"one \\\"test\\\"\",,two, tree",
-        ",", '\"') == true);
-    REQUIRE(pars.size() == 3);
-    REQUIRE(pars[0] == "\"one \"test\"");
-    REQUIRE(pars[1] == "two");
-    REQUIRE(pars[2] == "tree");
-}
-
-TEST_CASE("parameters quote 6", "")
-{
-    StringVect pars;
-    REQUIRE(splitParameters(pars, "\"one, test\",,two, tree", ",", '\"')
-        == true);
-    REQUIRE(pars.size() == 3);
-    REQUIRE(pars[0] == "one, test");
-    REQUIRE(pars[1] == "two");
-    REQUIRE(pars[2] == "tree");
-}
-
-TEST_CASE("parameters quote 7", "")
-{
-    StringVect pars;
-    REQUIRE(splitParameters(pars, "\"\\\"one, test\\\"\",,two, tree",
-        ",", '\"') == true);
-    REQUIRE(pars.size() == 3);
-    REQUIRE(pars[0] == "\"one, test\"");
-    REQUIRE(pars[1] == "two");
-    REQUIRE(pars[2] == "tree");
-}
-
-TEST_CASE("parameters quote 8", "")
-{
-    StringVect pars;
-    REQUIRE(splitParameters(pars, "\"\\\"\",,two, tree", ",", '\"')
-        == true);
-    REQUIRE(pars.size() == 3);
-    REQUIRE(pars[0] == "\"");
-    REQUIRE(pars[1] == "two");
-    REQUIRE(pars[2] == "tree");
-}
-
-TEST_CASE("parameters quote 9", "")
-{
-    StringVect pars;
-    REQUIRE(splitParameters(pars, "\"\\\",,two, tree", ",", '\"')
-        == true);
-    REQUIRE(pars.size() == 1);
-    REQUIRE(pars[0] == "\"\",,two, tree");
-}
-
-TEST_CASE("parameters quote 10", "")
-{
-    StringVect pars;
-    REQUIRE(splitParameters(pars, "\"", ",", '\"')
-        == true);
-    REQUIRE(pars.size() == 1);
-    REQUIRE(pars[0] == "\"");
-}
-
-TEST_CASE("parameters quote 11", "")
-{
-    StringVect pars;
-    REQUIRE(splitParameters(pars, "\\\"", ",", '\"')
-        == true);
-    REQUIRE(pars.size() == 1);
-    REQUIRE(pars[0] == "\"");
-}
-
-TEST_CASE("parameters quote 12", "")
-{
-    StringVect pars;
-    REQUIRE(splitParameters(pars, ",\"", ",", '\"')
-        == true);
-    REQUIRE(pars.size() == 1);
-    REQUIRE(pars[0] == "\"");
-}
-
-TEST_CASE("parameters quote 13", "")
-{
-    StringVect pars;
-    REQUIRE(splitParameters(pars, "\",", ",", '\"')
-        == true);
-    REQUIRE(pars.size() == 1);
-    REQUIRE(pars[0] == "\",");
-}
-
-TEST_CASE("parameters quote 14", "")
-{
-    StringVect pars;
-    REQUIRE(splitParameters(pars, "\\\",", ",", '\"')
-        == true);
-    REQUIRE(pars.size() == 1);
-    REQUIRE(pars[0] == "\"");
-}
-
-TEST_CASE("parameters quote 15", "")
-{
-    StringVect pars;
-    REQUIRE(splitParameters(pars, ",\\\"", ",", '\"')
-        == true);
-    REQUIRE(pars.size() == 1);
-    REQUIRE(pars[0] == "\"");
-}
-
-TEST_CASE("parameters quote 16", "")
-{
-    StringVect pars;
-    REQUIRE(splitParameters(pars, "\"one test\"", ",", '\"') ==
-        true);
-    REQUIRE(pars.size() == 1);
-    REQUIRE(pars[0] == "one test");
-}
-
-TEST_CASE("parameters quote 17", "")
-{
-    StringVect pars;
-    REQUIRE(splitParameters(pars, "\"one, test\"", ",", '\"') ==
-        true);
-    REQUIRE(pars.size() == 1);
-    REQUIRE(pars[0] == "one, test");
-}
-
-TEST_CASE("parameters quote 18", "")
-{
-    StringVect pars;
-    REQUIRE(splitParameters(pars, "\"one\\\" test\"", ",", '\"') ==
-        true);
-    REQUIRE(pars.size() == 1);
-    REQUIRE(pars[0] == "one\" test");
-}
-
-TEST_CASE("parameters quote 19", "")
-{
-    StringVect pars;
-    REQUIRE(splitParameters(pars, "\"one\\\" ,test\"", ",", '\"') ==
-        true);
-    REQUIRE(pars.size() == 1);
-    REQUIRE(pars[0] == "one\" ,test");
-}
-
-TEST_CASE("parameters quote 20", "")
-{
-    StringVect pars;
-    REQUIRE(splitParameters(pars, "\"one\\\" test,\"", ",", '\"') ==
-        true);
-    REQUIRE(pars.size() == 1);
-    REQUIRE(pars[0] == "one\" test,");
-}
-
-TEST_CASE("parameters complex 1", "")
-{
-    StringVect pars;
-    REQUIRE(splitParameters(pars, "\"test\" \"line\"", ",", '\"') == true);
-    REQUIRE(pars.size() == 1);
-    REQUIRE(pars[0] == "test\" \"line");
-}
-
-TEST_CASE("parameters complex 2", "")
-{
-    StringVect pars;
-    REQUIRE(splitParameters(pars, "\"test\", \"line\"", ",", '\"') == true);
-    REQUIRE(pars.size() == 2);
-    REQUIRE(pars[0] == "test");
-    REQUIRE(pars[1] == "line");
-}
-
-TEST_CASE("parameters complex 3", "")
-{
-    StringVect pars;
-    REQUIRE(splitParameters(pars, "\"test,\" \"line\"", ",", '\"') == true);
-    REQUIRE(pars.size() == 1);
-    REQUIRE(pars[0] == "test,\" \"line");
-}
-
-TEST_CASE("parameters broken 1", "")
-{
-    StringVect pars;
-    REQUIRE(splitParameters(pars, "\"", ",", '\"') == true);
-    REQUIRE(pars.size() == 1);
-    REQUIRE(pars[0] == "\"");
-}
-
-TEST_CASE("parameters broken 2", "")
-{
-    StringVect pars;
-    REQUIRE(splitParameters(pars, ",", ",", '\"') == true);
-    REQUIRE(pars.empty());
-}
-
-TEST_CASE("parameters broken 3", "")
-{
-    StringVect pars;
-    REQUIRE(splitParameters(pars,
-        ",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,", ",", '\"') == true);
-    REQUIRE(pars.empty());
-}
diff --git a/src/unittests/utils/stringutils.cc b/src/unittests/utils/stringutils.cc
deleted file mode 100644
index e69ebecba..000000000
--- a/src/unittests/utils/stringutils.cc
+++ /dev/null
@@ -1,1715 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2012-2017  The ManaPlus Developers
- *
- *  This file is part of The ManaPlus Client.
- *
- *  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
- *  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, see <http://www.gnu.org/licenses/>.
- */
-
-#include "unittests/unittests.h"
-
-#include "configuration.h"
-
-#include "const/utils/utf8.h"
-
-#include "fs/virtfs/fs.h"
-
-#include "utils/dtor.h"
-
-#include "resources/iteminfo.h"
-
-#include "resources/db/itemdb.h"
-
-#include "resources/resourcemanager/resourcemanager.h"
-
-#include "debug.h"
-
-TEST_CASE("stringuntils  trim 1", "")
-{
-    std::string str = "str";
-    REQUIRE("str" == trim(str));
-
-    str = " str";
-    REQUIRE("str" == trim(str));
-    REQUIRE("str" == trim(str));
-
-    str = " str   this IS Long Стринг "
-        "~!@#$%^&*()_+`-=[]\\{}|;':\",./<>?   ";
-    REQUIRE("str   this IS Long Стринг ~!@#$%^&*()_+`-=[]\\{}|;':\",./<>?" ==
-        trim(str));
-
-    str = "";
-    REQUIRE(trim(str).empty());
-}
-
-TEST_CASE("stringuntils toLower 1", "")
-{
-    std::string str = "str";
-    REQUIRE("str" == toLower(str));
-
-    str = " StR";
-    REQUIRE(" str" == toLower(str));
-
-    str = " str   this IS Long  "
-        "~!@#$%^&*()_+`-=[]\\{}|;':\",./<>?   ";
-
-    REQUIRE(" str   this is long  ~!@#$%^&*()_+`-=[]\\{}|;':\",./<>?   " ==
-        toLower(str));
-
-    str = "";
-    REQUIRE(toLower(str).empty());
-}
-
-TEST_CASE("stringuntils toUpper 1", "")
-{
-    std::string str = "str";
-    REQUIRE("STR" == toUpper(str));
-
-    str = " StR";
-    REQUIRE(" STR" == toUpper(str));
-
-    str = " str   this IS Long  "
-        "~!@#$%^&*()_+`-=[]\\{}|;':,./<>?   ";
-
-    REQUIRE(" STR   THIS IS LONG  ~!@#$%^&*()_+`-=[]\\{}|;':,./<>?   " ==
-        toUpper(str));
-
-    str = "";
-    REQUIRE(toUpper(str).empty());
-}
-
-TEST_CASE("stringuntils atox 1", "")
-{
-    std::string str = "0x10";
-    REQUIRE(16 == atox(str));
-
-    str = "0x0";
-    REQUIRE(0 == atox(str));
-
-    str = "0x1";
-    REQUIRE(1 == atox(str));
-
-    str = "0x0x0x0x0x0x0x0";
-    REQUIRE(0 == atox(str));
-
-    str = "0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
-    const int k = atox(str);
-    printf("%d\n", k);  // for avoid warning
-
-    str = "";
-    REQUIRE(0 == atox(str));
-
-    str = "0";
-    REQUIRE(0 == atox(str));
-
-    str = "0x";
-    REQUIRE(0 == atox(str));
-
-    str = "zzz";
-    REQUIRE(0 == atox(str));
-}
-
-TEST_CASE("stringuntils ipToString 1", "")
-{
-    REQUIRE("0.0.0.0" == std::string(ipToString(0)));
-    REQUIRE("219.255.210.73" == std::string(ipToString(1238564827)));
-}
-
-TEST_CASE("stringuntils toString 1", "")
-{
-    REQUIRE(strprintf("%d", 0) == toString(0));
-    REQUIRE(strprintf("%d", -1) == toString(-1));
-    REQUIRE(strprintf("%d", 30000000) == toString(30000000));
-    REQUIRE(strprintf("%d", -10000000) == toString(-10000000));
-    REQUIRE(strprintf("%d", 30000000) == toString(
-        static_cast<signed int>(30000000)));
-    REQUIRE(strprintf("%d", 3000) == toString(CAST_U16(3000)));
-    REQUIRE(strprintf("%d", 123) == toString(CAST_U8(123)));
-    REQUIRE(strprintf("%u", static_cast<uint32_t>(30000000)) == toString(
-        static_cast<uint32_t>(30000000)));
-    REQUIRE(strprintf("%f", 3.1f) == toString(3.1f));
-    REQUIRE(strprintf("%f", 3.1) == toString(3.1));
-}
-
-TEST_CASE("stringuntils toStringPrint 1", "")
-{
-    REQUIRE(toStringPrint(0) == "0 0x0");
-    REQUIRE(toStringPrint(10) == "10 0xa");
-    REQUIRE(toStringPrint(255) == "255 0xff");
-}
-
-TEST_CASE("stringuntils parse2Int 1", "")
-{
-    int a = -1;
-    int b = -1;
-
-    REQUIRE(parse2Int("", a, b) == false);
-    REQUIRE(a == -1);
-    REQUIRE(b == -1);
-
-    a = -1;
-    b = -1;
-    REQUIRE(parse2Int(",", a, b) == false);
-    REQUIRE(a == -1);
-    REQUIRE(b == -1);
-
-    a = -1;
-    b = -1;
-    REQUIRE(parse2Int("10,20", a, b) == true);
-    REQUIRE(a == 10);
-    REQUIRE(b == 20);
-
-    a = -1;
-    b = -1;
-    REQUIRE(parse2Int("10 20", a, b) == true);
-    REQUIRE(a == 10);
-    REQUIRE(b == 20);
-
-    a = -1;
-    b = -1;
-    REQUIRE(parse2Int("10 z20", a, b) == true);
-    REQUIRE(a == 10);
-    REQUIRE(b == 0);
-}
-
-TEST_CASE("stringuntils parse2Str 1", "")
-{
-    std::string str1 = "-";
-    std::string str2 = "-";
-
-    REQUIRE(parse2Str("", str1, str2) == false);
-    REQUIRE(str1 == "-");
-    REQUIRE(str2 == "-");
-
-    REQUIRE(parse2Str(",", str1, str2) == false);
-    REQUIRE(str1 == "-");
-    REQUIRE(str2 == "-");
-
-    str1 = "-";
-    str2 = "-";
-    REQUIRE(parse2Str("test line", str1, str2) == true);
-    REQUIRE(str1 == "test");
-    REQUIRE(str2 == "line");
-
-    str1 = "-";
-    str2 = "-";
-    REQUIRE(parse2Str("test,line", str1, str2) == true);
-    REQUIRE(str1 == "test");
-    REQUIRE(str2 == "line");
-}
-
-TEST_CASE("stringuntils parseNumber 1", "")
-{
-    REQUIRE(parseNumber("") == 0);
-    REQUIRE(parseNumber("0x") == 0);
-    REQUIRE(parseNumber("10") == 10);
-    REQUIRE(parseNumber("h10") == 16);
-    REQUIRE(parseNumber("x100") == 256);
-    REQUIRE(parseNumber("0x20") == 32);
-}
-
-TEST_CASE("stringuntils removeToken 1", "")
-{
-    std::string str;
-
-    REQUIRE(removeToken(str, " ").empty());
-    REQUIRE(str.empty());
-
-    str = "test";
-    REQUIRE(removeToken(str, " ").empty());
-    REQUIRE(str.empty());
-
-    str = "test line";
-    REQUIRE(removeToken(str, " ") == "line");
-    REQUIRE(str == "line");
-
-    str = "test,line";
-    REQUIRE(removeToken(str, ",") == "line");
-    REQUIRE(str == "line");
-
-    str = "test line";
-    REQUIRE(removeToken(str, ",").empty());
-    REQUIRE(str.empty());
-
-    str = ",line";
-    REQUIRE(removeToken(str, ",").empty());
-    REQUIRE(str.empty());
-}
-
-TEST_CASE("stringuntils strprintf 1", "")
-{
-    REQUIRE(strprintf("%s very long string. 123456789012345678901234567890"
-        "+++++++++++++++++++++++++++++++++++++++"
-        "________________________________"
-        "***********************************"
-        "----------------------------------------"
-        "|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| %s",
-        "test", "end of test") ==
-        "test very long string. 123456789012345678901234567890"
-        "+++++++++++++++++++++++++++++++++++++++"
-        "________________________________"
-        "***********************************"
-        "----------------------------------------"
-        "|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| "
-        "end of test");
-}
-
-TEST_CASE("stringuntils toString 2", "")
-{
-    for (int f = 0; f < 10000000; f += 123)
-    {
-        REQUIRE(strprintf("%d", f) == toString(f));
-    }
-}
-
-TEST_CASE("stringuntils removeColors 1", "")
-{
-    REQUIRE(removeColors("").empty());
-    REQUIRE("#" == removeColors("#"));
-    REQUIRE("##" == removeColors("##"));
-    REQUIRE(removeColors("##1").empty());
-    REQUIRE("2" == removeColors("##12"));
-    REQUIRE("1##" == removeColors("1##"));
-    REQUIRE("1" == removeColors("1##2"));
-    REQUIRE("13" == removeColors("1##23"));
-    REQUIRE("#1#2" == removeColors("#1#2"));
-    REQUIRE("#1" == removeColors("#1##2"));
-}
-
-TEST_CASE("stringuntils compareStrI 1", "")
-{
-    std::string str1;
-    std::string str2;
-    REQUIRE(0 == compareStrI(str1, str2));
-
-    str1 = "test";
-    str2 = "test";
-    REQUIRE(0 == compareStrI(str1, str2));
-
-    str1 = "test";
-    str2 = "test1";
-    REQUIRE(0 > compareStrI(str1, str2));
-
-    str1 = "test";
-    str2 = "aest1aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
-    REQUIRE(0 < compareStrI(str1, str2));
-
-    str1 = "testaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
-    str2 = "testaa";
-    REQUIRE(0 < compareStrI(str1, str2));
-}
-
-TEST_CASE("stringuntils isWordSeparator 1", "")
-{
-    REQUIRE(isWordSeparator(' '));
-    REQUIRE(isWordSeparator(','));
-    REQUIRE(isWordSeparator('.'));
-    REQUIRE(isWordSeparator('\"'));
-    REQUIRE(!isWordSeparator(0));
-    REQUIRE(!isWordSeparator('a'));
-    REQUIRE(!isWordSeparator('-'));
-}
-
-TEST_CASE("stringuntils findSameSubstring", "")
-{
-    std::string str1;
-    std::string str2;
-
-    REQUIRE(findSameSubstring("", "").empty());
-
-    str1 = "test line";
-    str2 = "test line";
-    REQUIRE("test line" == findSameSubstring(str1, str2));
-
-    str1 = "test li";
-    str2 = "test line";
-    REQUIRE("test li" == findSameSubstring(str1, str2));
-
-    str1 = "test li";
-    str2 = "est li";
-    REQUIRE(findSameSubstring(str1, str2).empty());
-}
-
-TEST_CASE("stringuntils findSameSubstringI", "")
-{
-    std::string str1;
-    std::string str2;
-
-    REQUIRE(findSameSubstringI("", "").empty());
-
-    str1 = "tEst line";
-    str2 = "tesT line";
-    REQUIRE("tEst line" == findSameSubstringI(str1, str2));
-
-    str1 = "test Li";
-    str2 = "test lINe";
-    REQUIRE("test Li" == findSameSubstringI(str1, str2));
-
-    str1 = "test lINe";
-    str2 = "test Li";
-    REQUIRE("test lI" == findSameSubstringI(str1, str2));
-
-    str1 = "teSt li";
-    str2 = "est li";
-    REQUIRE(findSameSubstringI(str1, str2).empty());
-}
-
-TEST_CASE("stringuntils findI 1", "")
-{
-    REQUIRE(0 == findI("", ""));
-    REQUIRE(std::string::npos == findI("test", "line"));
-    REQUIRE(0 == findI("test line", "t"));
-    REQUIRE(0 == findI("test line", "te"));
-    REQUIRE(3 == findI("test line", "t l"));
-}
-
-TEST_CASE("stringuntils findI 2", "")
-{
-    STD_VECTOR <std::string> vect1;
-    vect1.push_back("test");
-    vect1.push_back("line");
-    vect1.push_back("qwe");
-
-    REQUIRE(std::string::npos == findI("", vect1));
-    REQUIRE(0 == findI("test", vect1));
-    REQUIRE(0 == findI("tesT lIne", vect1));
-    REQUIRE(5 == findI("teoT line", vect1));
-    REQUIRE(std::string::npos == findI("zzz", vect1));
-}
-
-TEST_CASE("stringuntils encodeStr 1", "")
-{
-    std::string str = encodeStr(10, 1);
-    REQUIRE(10 == decodeStr(str));
-
-    str.clear();
-    REQUIRE(0 == decodeStr(str));
-
-    str = encodeStr(10, 2);
-    REQUIRE(10 == decodeStr(str));
-
-    str = encodeStr(100, 3);
-    REQUIRE(100 == decodeStr(str));
-
-    str = encodeStr(1000, 4);
-    REQUIRE(1000 == decodeStr(str));
-}
-
-TEST_CASE("stringuntils extractNameFromSprite 1", "")
-{
-    REQUIRE(extractNameFromSprite("").empty());
-    REQUIRE("test" == extractNameFromSprite("test"));
-    REQUIRE("test" == extractNameFromSprite("test.qwe"));
-    REQUIRE("line" == extractNameFromSprite("test/line.zzz"));
-    REQUIRE("line" == extractNameFromSprite("test\\line.zzz"));
-    REQUIRE("line" == extractNameFromSprite("test/test2\\line.zzz"));
-    REQUIRE("line" == extractNameFromSprite("test\\test2/line.zzz"));
-}
-
-TEST_CASE("stringuntils removeSpriteIndex 1", "")
-{
-    REQUIRE(removeSpriteIndex("").empty());
-    REQUIRE("test" == removeSpriteIndex("test"));
-    REQUIRE("test" == removeSpriteIndex("test[1]"));
-    REQUIRE("line" == removeSpriteIndex("test/line[12]"));
-    REQUIRE("line" == removeSpriteIndex("test\\line[12]"));
-    REQUIRE("line" == removeSpriteIndex("test/test2\\line[12]"));
-    REQUIRE("line" == removeSpriteIndex("test\\test2/line[1]"));
-}
-
-TEST_CASE("stringutils getSafeUtf8String 1", "")
-{
-    const char *str;
-    str = getSafeUtf8String("");
-    REQUIRE(str != nullptr);
-    REQUIRE(strcmp("", str) == 0);
-    REQUIRE(str[0] == '\0');
-    REQUIRE(str[UTF8_MAX_SIZE - 1] == '\0');
-    delete [] str;
-
-    str = getSafeUtf8String("test line");
-    REQUIRE(str != nullptr);
-    REQUIRE(strcmp("test line", str) == 0);
-    REQUIRE(str[strlen("test line")] == '\0');
-    REQUIRE(str[UTF8_MAX_SIZE - 1] == '\0');
-    delete [] str;
-
-    str = getSafeUtf8String("1");
-    REQUIRE(str != nullptr);
-    REQUIRE(strcmp("1", str) == 0);
-    REQUIRE(str[1] == '\0');
-    REQUIRE(str[UTF8_MAX_SIZE - 1] == '\0');
-    delete [] str;
-}
-
-TEST_CASE("stringutils getSafeUtf8String 2", "")
-{
-    char *str;
-
-    getSafeUtf8String("test", nullptr);
-
-    str = new char[65535];
-    getSafeUtf8String("", str);
-    REQUIRE(str != nullptr);
-    REQUIRE(strcmp("", str) == 0);
-    REQUIRE(str[0] == '\0');
-    REQUIRE(str[UTF8_MAX_SIZE - 1] == '\0');
-    delete [] str;
-
-    str = new char[65535];
-    getSafeUtf8String("test line", str);
-    REQUIRE(str != nullptr);
-    REQUIRE(strcmp("test line", str) == 0);
-    REQUIRE(str[strlen("test line")] == '\0');
-    REQUIRE(str[UTF8_MAX_SIZE - 1] == '\0');
-    delete [] str;
-
-    str = new char[65535];
-    getSafeUtf8String("1", str);
-    REQUIRE(str != nullptr);
-    REQUIRE(strcmp("1", str) == 0);
-    REQUIRE(str[1] == '\0');
-    REQUIRE(str[UTF8_MAX_SIZE - 1] == '\0');
-    delete [] str;
-
-    str = new char[65535];
-    char *data1 = new char[65510];
-    memset(data1, 'a', 65510);
-    data1[65509] = '\0';
-    char *data2 = new char[65510];
-    memset(data2, 'a', 65500);
-    data2[65500] = '\0';
-    getSafeUtf8String(data1, str);
-    REQUIRE(str != nullptr);
-    REQUIRE(strcmp(data2, str) == 0);
-    REQUIRE(str[65500] == '\0');
-    delete [] data1;
-    delete [] data2;
-    delete [] str;
-}
-
-TEST_CASE("stringuntils getFileName 1", "")
-{
-    REQUIRE(getFileName("").empty());
-    REQUIRE("file" == getFileName("file"));
-    REQUIRE("file" == getFileName("test/file1\\file"));
-    REQUIRE("file" == getFileName("test\\file1/file"));
-    REQUIRE(getFileName("file/").empty());
-    REQUIRE("file" == getFileName("/file"));
-}
-
-TEST_CASE("stringuntils getFileDir 1", "")
-{
-    REQUIRE(getFileDir("").empty());
-    REQUIRE("file" == getFileDir("file"));
-    REQUIRE("test/file1" == getFileDir("test/file1\\file"));
-    REQUIRE("test\\file1" == getFileDir("test\\file1/file"));
-    REQUIRE("file" == getFileDir("file/"));
-    REQUIRE(getFileDir("/file").empty());
-}
-
-TEST_CASE("stringuntils replaceAll 1", "")
-{
-    std::string str1;
-    std::string str2;
-    std::string str3;
-
-    REQUIRE(replaceAll(str1, str2, str3).empty());
-
-    str1 = "this is test line";
-    str2 = "";
-    str3 = "";
-    REQUIRE("this is test line" == replaceAll(str1, str2, str3));
-
-    str1 = "this is test line";
-    str2 = "is ";
-    str3 = "";
-    REQUIRE("thtest line" == replaceAll(str1, str2, str3));
-
-    str1 = "this is test line";
-    str2 = "";
-    str3 = "1";
-    REQUIRE("this is test line" == replaceAll(str1, str2, str3));
-}
-
-TEST_CASE("stringuntils replaceRecursiveAll 1", "")
-{
-    std::string str;
-    str = "";
-    replaceRecursiveAll(str, "line", '.');
-    REQUIRE(str.empty());
-    str = "test line";
-    replaceRecursiveAll(str, "line", '.');
-    REQUIRE(str == "test .");
-    str = "11112222";
-    replaceRecursiveAll(str, "11", '1');
-    REQUIRE(str == "12222");
-    str = "122221";
-    replaceRecursiveAll(str, "11", '1');
-    REQUIRE(str == "122221");
-    str = "1222211";
-    replaceRecursiveAll(str, "11", '1');
-    REQUIRE(str == "122221");
-    str = "11112222";
-    replaceRecursiveAll(str, "112", '1');
-    REQUIRE(str == "111222");
-    str = "111122224";
-    replaceRecursiveAll(str, "112", '1');
-    REQUIRE(str == "1112224");
-    str = "3111122224";
-    replaceRecursiveAll(str, "112", '1');
-    REQUIRE(str == "31112224");
-    str = "121212";
-    replaceRecursiveAll(str, "12", '1');
-    REQUIRE(str == "111");
-    str = "1121212";
-    replaceRecursiveAll(str, "12", '1');
-    REQUIRE(str == "1111");
-    str = "11212122";
-    replaceRecursiveAll(str, "12", '1');
-    REQUIRE(str == "1111");
-    str = "112121222";
-    replaceRecursiveAll(str, "12", '1');
-    REQUIRE(str == "1111");
-    str = "112211221122";
-    replaceRecursiveAll(str, "12", '1');
-    REQUIRE(str == "111111");
-}
-
-TEST_CASE("stringuntils getBoolFromString 1", "")
-{
-    REQUIRE(getBoolFromString("true"));
-    REQUIRE(getBoolFromString("yes"));
-    REQUIRE(getBoolFromString("on"));
-    REQUIRE(!getBoolFromString("false"));
-    REQUIRE(!getBoolFromString("no"));
-    REQUIRE(!getBoolFromString("off"));
-    REQUIRE(getBoolFromString("1"));
-    REQUIRE(!getBoolFromString("0"));
-    REQUIRE(getBoolFromString("2"));
-
-    REQUIRE(getBoolFromString(" true"));
-    REQUIRE(getBoolFromString("yes "));
-    REQUIRE(getBoolFromString(" on"));
-    REQUIRE(!getBoolFromString("false "));
-    REQUIRE(!getBoolFromString(" no"));
-    REQUIRE(!getBoolFromString("off "));
-    REQUIRE(getBoolFromString(" 1"));
-    REQUIRE(!getBoolFromString("0 "));
-    REQUIRE(getBoolFromString(" 2"));
-
-    REQUIRE(getBoolFromString("tRue "));
-    REQUIRE(getBoolFromString(" Yes"));
-    REQUIRE(getBoolFromString("ON "));
-    REQUIRE(!getBoolFromString(" fALse"));
-    REQUIRE(!getBoolFromString("nO "));
-    REQUIRE(!getBoolFromString(" oFF"));
-}
-
-TEST_CASE("stringuntils parseBoolean 1", "")
-{
-    REQUIRE(parseBoolean("true") == 1);
-    REQUIRE(parseBoolean("yes") == 1);
-    REQUIRE(parseBoolean("on") == 1);
-    REQUIRE(parseBoolean("false") == 0);
-    REQUIRE(parseBoolean("no") == 0);
-    REQUIRE(parseBoolean("off") == 0);
-    REQUIRE(parseBoolean("1") == 1);
-    REQUIRE(parseBoolean("0") == 0);
-    REQUIRE(parseBoolean("2") == -1);
-    REQUIRE(parseBoolean("test") == -1);
-    REQUIRE(parseBoolean("") == -1);
-
-    REQUIRE(parseBoolean("true ") == 1);
-    REQUIRE(parseBoolean(" yes") == 1);
-    REQUIRE(parseBoolean("on ") == 1);
-    REQUIRE(parseBoolean(" false") == 0);
-    REQUIRE(parseBoolean("no ") == 0);
-    REQUIRE(parseBoolean(" off") == 0);
-    REQUIRE(parseBoolean("1 ") == 1);
-    REQUIRE(parseBoolean(" 0") == 0);
-    REQUIRE(parseBoolean("2 ") == -1);
-    REQUIRE(parseBoolean(" test") == -1);
-    REQUIRE(parseBoolean(" ") == -1);
-
-    REQUIRE(parseBoolean(" tRue") == 1);
-    REQUIRE(parseBoolean("Yes ") == 1);
-    REQUIRE(parseBoolean(" ON") == 1);
-    REQUIRE(parseBoolean("FaLse ") == 0);
-    REQUIRE(parseBoolean(" nO") == 0);
-    REQUIRE(parseBoolean("oFf ") == 0);
-    REQUIRE(parseBoolean(" tEst") == -1);
-}
-
-TEST_CASE("stringuntils splitToIntSet 1", "")
-{
-    std::set<int> tokens;
-    splitToIntSet(tokens, "", ',');
-    REQUIRE(tokens.empty() == true);
-
-    tokens.clear();
-    splitToIntSet(tokens, "10z,aa,-1", ',');
-    REQUIRE(tokens.size() == 3);
-    REQUIRE(tokens.find(10) != tokens.end());
-    REQUIRE(tokens.find(0) != tokens.end());
-    REQUIRE(tokens.find(-1) != tokens.end());
-
-    tokens.clear();
-    splitToIntSet(tokens, "10,2,30", ',');
-    REQUIRE(tokens.size() == 3);
-    REQUIRE(tokens.find(10) != tokens.end());
-    REQUIRE(tokens.find(2) != tokens.end());
-    REQUIRE(tokens.find(30) != tokens.end());
-
-    tokens.clear();
-    splitToIntSet(tokens, "10,2,30,", ',');
-    REQUIRE(tokens.size() == 3);
-    REQUIRE(tokens.find(10) != tokens.end());
-    REQUIRE(tokens.find(2) != tokens.end());
-    REQUIRE(tokens.find(30) != tokens.end());
-
-    tokens.clear();
-    splitToIntSet(tokens, "10,2;30", ',');
-    REQUIRE(tokens.size() == 2);
-    REQUIRE(tokens.find(10) != tokens.end());
-    REQUIRE(tokens.find(2) != tokens.end());
-
-    tokens.clear();
-    splitToIntSet(tokens, "10;20;30", ';');
-    REQUIRE(tokens.size() == 3);
-    REQUIRE(tokens.find(10) != tokens.end());
-    REQUIRE(tokens.find(20) != tokens.end());
-    REQUIRE(tokens.find(30) != tokens.end());
-}
-
-TEST_CASE("stringuntils splitToIntList 1", "")
-{
-    std::list<int> tokens;
-    tokens = splitToIntList("", ',');
-    REQUIRE(tokens.empty() == true);
-
-    tokens.clear();
-    tokens = splitToIntList("10z,a,-1", ',');
-    REQUIRE(tokens.size() == 3);
-    REQUIRE(tokens.front() == 10);
-    tokens.pop_front();
-    REQUIRE(tokens.front() == 0);
-    tokens.pop_front();
-    REQUIRE(tokens.front() == -1);
-    tokens.pop_front();
-
-    tokens.clear();
-    tokens = splitToIntList("10,2,30", ',');
-    REQUIRE(tokens.size() == 3);
-    REQUIRE(tokens.front() == 10);
-    tokens.pop_front();
-    REQUIRE(tokens.front() == 2);
-    tokens.pop_front();
-    REQUIRE(tokens.front() == 30);
-    tokens.pop_front();
-
-    tokens.clear();
-    tokens = splitToIntList("10,2,30,", ',');
-    REQUIRE(tokens.size() == 3);
-    REQUIRE(tokens.front() == 10);
-    tokens.pop_front();
-    REQUIRE(tokens.front() == 2);
-    tokens.pop_front();
-    REQUIRE(tokens.front() == 30);
-    tokens.pop_front();
-
-    tokens.clear();
-    tokens = splitToIntList("10,2;30", ',');
-    REQUIRE(tokens.size() == 2);
-    REQUIRE(tokens.front() == 10);
-    tokens.pop_front();
-    REQUIRE(tokens.front() == 2);
-    tokens.pop_front();
-
-    tokens.clear();
-    tokens = splitToIntList("10;20;30", ';');
-    REQUIRE(tokens.size() == 3);
-    REQUIRE(tokens.front() == 10);
-    tokens.pop_front();
-    REQUIRE(tokens.front() == 20);
-    tokens.pop_front();
-    REQUIRE(tokens.front() == 30);
-    tokens.pop_front();
-}
-
-TEST_CASE("stringuntils splitToStringSet 1", "")
-{
-    std::set<std::string> tokens;
-    splitToStringSet(tokens, "", ',');
-    REQUIRE(tokens.empty() == true);
-
-    tokens.clear();
-    splitToStringSet(tokens, "10q,2w,30e", ',');
-    REQUIRE(tokens.size() == 3);
-    REQUIRE(tokens.find("10q") != tokens.end());
-    REQUIRE(tokens.find("2w") != tokens.end());
-    REQUIRE(tokens.find("30e") != tokens.end());
-
-    tokens.clear();
-    splitToStringSet(tokens, "10q,2w,30e,", ',');
-    REQUIRE(tokens.size() == 3);
-    REQUIRE(tokens.find("10q") != tokens.end());
-    REQUIRE(tokens.find("2w") != tokens.end());
-    REQUIRE(tokens.find("30e") != tokens.end());
-
-    tokens.clear();
-    splitToStringSet(tokens, "10q,,30e", ',');
-    REQUIRE(tokens.size() == 2);
-    REQUIRE(tokens.find("10q") != tokens.end());
-    REQUIRE(tokens.find("30e") != tokens.end());
-
-    tokens.clear();
-    splitToStringSet(tokens, "10q,2w,30e,", ',');
-    REQUIRE(tokens.size() == 3);
-    REQUIRE(tokens.find("10q") != tokens.end());
-    REQUIRE(tokens.find("2w") != tokens.end());
-    REQUIRE(tokens.find("30e") != tokens.end());
-
-    tokens.clear();
-    splitToStringSet(tokens, "10w,2w;30e", ',');
-    REQUIRE(tokens.size() == 2);
-    REQUIRE(tokens.find("10w") != tokens.end());
-    REQUIRE(tokens.find("2w;30e") != tokens.end());
-
-    tokens.clear();
-    splitToStringSet(tokens, "10q;20w;30e", ';');
-    REQUIRE(tokens.size() == 3);
-    REQUIRE(tokens.find("10q") != tokens.end());
-    REQUIRE(tokens.find("20w") != tokens.end());
-    REQUIRE(tokens.find("30e") != tokens.end());
-}
-
-TEST_CASE("stringuntils splitToIntVector 1", "")
-{
-    STD_VECTOR<int> tokens;
-    splitToIntVector(tokens, "", ',');
-    REQUIRE(tokens.empty() == true);
-
-    tokens.clear();
-    splitToIntVector(tokens, "10,2,30", ',');
-    REQUIRE(tokens.size() == 3);
-    REQUIRE(tokens[0] == 10);
-    REQUIRE(tokens[1] == 2);
-    REQUIRE(tokens[2] == 30);
-
-    tokens.clear();
-    splitToIntVector(tokens, "10,2a,z30", ',');
-    REQUIRE(tokens.size() == 3);
-    REQUIRE(tokens[0] == 10);
-    REQUIRE(tokens[1] == 2);
-    REQUIRE(tokens[2] == 0);
-
-    tokens.clear();
-    splitToIntVector(tokens, "10,2,30,", ',');
-    REQUIRE(tokens.size() == 3);
-    REQUIRE(tokens[0] == 10);
-    REQUIRE(tokens[1] == 2);
-    REQUIRE(tokens[2] == 30);
-
-    tokens.clear();
-    splitToIntVector(tokens, "10,,30", ',');
-    REQUIRE(tokens.size() == 2);
-    REQUIRE(tokens[0] == 10);
-    REQUIRE(tokens[1] == 30);
-
-    tokens.clear();
-    splitToIntVector(tokens, "10,2;30", ',');
-    REQUIRE(tokens.size() == 2);
-    REQUIRE(tokens[0] == 10);
-    REQUIRE(tokens[1] == 2);
-
-    tokens.clear();
-    splitToIntVector(tokens, "10;20;30", ';');
-    REQUIRE(tokens.size() == 3);
-    REQUIRE(tokens[0] == 10);
-    REQUIRE(tokens[1] == 20);
-    REQUIRE(tokens[2] == 30);
-}
-
-TEST_CASE("stringuntils splitToStringVector 1", "")
-{
-    STD_VECTOR<std::string> tokens;
-    splitToStringVector(tokens, "", ',');
-    REQUIRE(tokens.empty() == true);
-
-    tokens.clear();
-    splitToStringVector(tokens, "t,line,zz", ',');
-    REQUIRE(tokens.size() == 3);
-    REQUIRE(tokens[0] == "t");
-    REQUIRE(tokens[1] == "line");
-    REQUIRE(tokens[2] == "zz");
-
-    tokens.clear();
-    splitToStringVector(tokens, "t,line,zz,", ',');
-    REQUIRE(tokens.size() == 3);
-    REQUIRE(tokens[0] == "t");
-    REQUIRE(tokens[1] == "line");
-    REQUIRE(tokens[2] == "zz");
-
-    tokens.clear();
-    splitToStringVector(tokens, "t,,zz", ',');
-    REQUIRE(tokens.size() == 2);
-    REQUIRE(tokens[0] == "t");
-    REQUIRE(tokens[1] == "zz");
-
-    tokens.clear();
-    splitToStringVector(tokens, "10,a2;30", ',');
-    REQUIRE(tokens.size() == 2);
-    REQUIRE(tokens[0] == "10");
-    REQUIRE(tokens[1] == "a2;30");
-
-    tokens.clear();
-    splitToStringVector(tokens, "a10;b;3line", ';');
-    REQUIRE(tokens.size() == 3);
-    REQUIRE(tokens[0] == "a10");
-    REQUIRE(tokens[1] == "b");
-    REQUIRE(tokens[2] == "3line");
-}
-
-TEST_CASE("stringuntils replaceSpecialChars 1", "")
-{
-    std::string str;
-
-    str = "";
-    replaceSpecialChars(str);
-    REQUIRE(str.empty());
-
-    str = "test";
-    replaceSpecialChars(str);
-    REQUIRE("test" == str);
-
-    str = "&";
-    replaceSpecialChars(str);
-    REQUIRE("&" == str);
-
-    str = "&1";
-    replaceSpecialChars(str);
-    REQUIRE("&1" == str);
-
-    str = "&33";
-    replaceSpecialChars(str);
-    REQUIRE("&33" == str);
-
-    str = "&33;";
-    replaceSpecialChars(str);
-    REQUIRE("!" == str);
-
-    str = "&33z;";
-    replaceSpecialChars(str);
-    REQUIRE("&33z;" == str);
-
-    str = "1&33;";
-    replaceSpecialChars(str);
-    REQUIRE("1!" == str);
-
-    str = "&33;2";
-    replaceSpecialChars(str);
-    REQUIRE("!2" == str);
-
-    str = "&33;&";
-    replaceSpecialChars(str);
-    REQUIRE("!&" == str);
-
-    str = "test line&33;";
-    replaceSpecialChars(str);
-    REQUIRE("test line!" == str);
-}
-
-TEST_CASE("stringuntils normalize 1", "")
-{
-    REQUIRE(normalize("").empty());
-    REQUIRE(normalize("test") == "test");
-    REQUIRE(normalize("Test") == "test");
-    REQUIRE(normalize(" test line") == "test line");
-    REQUIRE(normalize("test line ") == "test line");
-    REQUIRE(normalize(" tEst line") == "test line");
-    REQUIRE(normalize("test lIne ") == "test line");
-}
-
-TEST_CASE("stringuntils combineDye 1", "")
-{
-    REQUIRE(combineDye("", "").empty());
-    REQUIRE("test" == combineDye("test", ""));
-    REQUIRE("|line" == combineDye("", "line"));
-    REQUIRE("test|line" == combineDye("test", "line"));
-    REQUIRE("|line" == combineDye("|w", "line"));
-    REQUIRE("aaa|line" == combineDye("aaa|w", "line"));
-    REQUIRE("test|line" == combineDye("test|w", "line"));
-}
-
-TEST_CASE("stringuntils combineDye 2", "")
-{
-    REQUIRE(combineDye2("", "").empty());
-    REQUIRE("test" == combineDye2("test", ""));
-    REQUIRE("test" == combineDye2("test", "W"));
-    REQUIRE(combineDye2("", "line").empty());
-    REQUIRE("test.xml" == combineDye2("test.xml", "123"));
-    REQUIRE("test.xml|#43413d,59544f,7a706c" ==
-        combineDye2("test.xml|#43413d,59544f,7a706c", ""));
-    REQUIRE("test.xml|#43413d,59544f,7a706c:W;" ==
-        combineDye2("test.xml|#43413d,59544f,7a706c", "W"));
-    REQUIRE("test.xml|#43413d,59544f,7a706c:W;#123456:B;" ==
-        combineDye2("test.xml|#43413d,59544f,7a706c;#123456", "W;B"));
-}
-
-TEST_CASE("stringuntils combineDye 3", "")
-{
-    REQUIRE(combineDye3("", "").empty());
-    REQUIRE("test" == combineDye3("test", ""));
-    REQUIRE(combineDye3("", "line").empty());
-    REQUIRE("test.xml|123" == combineDye3("test.xml", "123"));
-    REQUIRE("test.xml|#43413d,59544f,7a706c" ==
-        combineDye3("test.xml|#43413d,59544f,7a706c", ""));
-    REQUIRE("test.xml|#43413d,59544f,7a706c:W;" ==
-        combineDye3("test.xml|#43413d,59544f,7a706c", "W"));
-    REQUIRE("test.xml|#43413d,59544f,7a706c:W;#123456:B;" ==
-        combineDye3("test.xml|#43413d,59544f,7a706c;#123456", "W;B"));
-}
-
-TEST_CASE("stringuntils packList 1", "")
-{
-    std::list <std::string> list;
-    REQUIRE(packList(list).empty());
-
-    list.push_back(std::string());
-    REQUIRE("|" == packList(list));
-
-    list.clear();
-    list.push_back("test");
-    REQUIRE("test" == packList(list));
-
-    list.push_back("line");
-    REQUIRE("test|line" == packList(list));
-
-    list.push_back("2");
-    REQUIRE("test|line|2" == packList(list));
-
-    list.clear();
-    list.push_back("|test");
-    list.push_back("line");
-    REQUIRE("|test|line" == packList(list));
-}
-
-TEST_CASE("stringuntils stringToHexPath 1", "")
-{
-    std::string str;
-
-    str = "";
-    REQUIRE(stringToHexPath(str).empty());
-
-    str = "a";
-    REQUIRE("%61/" == stringToHexPath(str));
-
-    str = "ab";
-    REQUIRE("%61/%62" == stringToHexPath(str));
-
-    str = "abc";
-    REQUIRE("%61/%62%63" == stringToHexPath(str));
-
-    str = "abcd";
-    REQUIRE("%61/%62%63%64" == stringToHexPath(str));
-}
-
-TEST_CASE("stringuntils deleteCharLeft 1", "")
-{
-    std::string str;
-    unsigned int pos = 0;
-
-    str = "";
-    deleteCharLeft(str, nullptr);
-    REQUIRE(str.empty());
-
-    str = "test line";
-    pos = 4;
-    deleteCharLeft(str, &pos);
-    REQUIRE("tes line" == str);
-
-    str = "тест line";
-    pos = 8;
-    deleteCharLeft(str, &pos);
-    REQUIRE("тес line" == str);
-
-    str = "test line\x0";
-    pos = 4;
-    deleteCharLeft(str, &pos);
-    REQUIRE("tes line\x0" == str);
-}
-
-TEST_CASE("stringuntils findLast 1", "")
-{
-    std::string str;
-
-    str = "";
-    REQUIRE(findLast(str, ""));
-
-    str = "test line";
-    REQUIRE(findLast(str, "line"));
-
-    str = "test line";
-    REQUIRE(!findLast(str, "lin"));
-}
-
-TEST_CASE("stringuntils findFirst 1", "")
-{
-    std::string str;
-
-    str = "";
-    REQUIRE(findFirst(str, ""));
-
-    str = "test line";
-    REQUIRE(findFirst(str, "test"));
-
-    str = "test";
-    REQUIRE(findFirst(str, "test line") == false);
-
-    str = "test line";
-    REQUIRE(findFirst(str, "est") == false);
-}
-
-TEST_CASE("stringuntils findCutLast 1", "")
-{
-    std::string str;
-
-    str = "";
-    REQUIRE(findCutLast(str, ""));
-    REQUIRE(str.empty());
-
-    str = "test line";
-    REQUIRE(findCutLast(str, "line"));
-    REQUIRE("test " == str);
-
-    str = "test line";
-    REQUIRE(findCutLast(str, "lin") == false);
-    REQUIRE("test line" == str);
-
-    str = "test";
-    REQUIRE(findCutLast(str, "test line") == false);
-    REQUIRE("test" == str);
-}
-
-TEST_CASE("stringuntils CutLast 1", "")
-{
-    std::string str;
-
-    str = "";
-    cutLast(str, "");
-    REQUIRE(str.empty());
-
-    str = "test line";
-    cutLast(str, "line");
-    REQUIRE("test " == str);
-
-    str = "test line";
-    cutLast(str, "lin");
-    REQUIRE("test line" == str);
-
-    str = "test";
-    cutLast(str, "test line");
-    REQUIRE("test" == str);
-}
-
-TEST_CASE("stringuntils findCutFirst 1", "")
-{
-    std::string str;
-
-    str = "";
-    REQUIRE(findCutFirst(str, ""));
-    REQUIRE(str.empty());
-
-    str = "test line";
-    REQUIRE(findCutFirst(str, "test"));
-    REQUIRE(" line" == str);
-
-    str = "test line";
-    REQUIRE(findCutFirst(str, "est") == false);
-    REQUIRE("test line" == str);
-
-    str = "test";
-    REQUIRE(findCutFirst(str, "test line") == false);
-    REQUIRE("test" == str);
-}
-
-TEST_CASE("stringuntils cutFirst 1", "")
-{
-    std::string str;
-
-    str = "";
-    cutFirst(str, "");
-    REQUIRE(str.empty());
-
-    str = "test line";
-    cutFirst(str, "test");
-    REQUIRE(" line" == str);
-
-    str = "test line";
-    cutFirst(str, "est");
-    REQUIRE("test line" == str);
-
-    str = "test";
-    cutFirst(str, "test line");
-    REQUIRE("test" == str);
-}
-
-TEST_CASE("stringuntils removeProtocol 1", "")
-{
-    std::string str;
-
-    str = "";
-    REQUIRE(removeProtocol(str).empty());
-
-    str = "http://";
-    REQUIRE(removeProtocol(str).empty());
-
-    str = "http://test";
-    REQUIRE("test" == removeProtocol(str));
-}
-
-TEST_CASE("stringuntils strStartWith 1", "")
-{
-    REQUIRE(strStartWith("", ""));
-    REQUIRE(!strStartWith("", "1"));
-    REQUIRE(strStartWith("test line", "test"));
-    REQUIRE(strStartWith("test line", "test line"));
-    REQUIRE(!strStartWith("test line", "est"));
-}
-
-TEST_CASE("stringuntils encodeLinkText", "")
-{
-    std::string str;
-
-    str = encodeLinkText("test line");
-    REQUIRE(str == "test line");
-    str = encodeLinkText("test|line");
-    REQUIRE(str == "test\342\235\230line");
-    str = encodeLinkText("test||line");
-    REQUIRE(str == "test\342\235\230\342\235\230line");
-}
-
-TEST_CASE("stringuntils decodeLinkText", "")
-{
-    std::string str;
-
-    str = encodeLinkText("test|line");
-    REQUIRE(str == "test\342\235\230line");
-    str = decodeLinkText(str);
-    REQUIRE(str == "test|line");
-}
-
-TEST_CASE("stringuntils isDigit", "")
-{
-    REQUIRE_FALSE(isDigit(""));
-    REQUIRE(isDigit("1"));
-    REQUIRE(isDigit("123"));
-    REQUIRE_FALSE(isDigit("+123"));
-    REQUIRE_FALSE(isDigit("-123"));
-    REQUIRE_FALSE(isDigit("1.23"));
-    REQUIRE_FALSE(isDigit("12-34"));
-}
-
-TEST_CASE("stringuntils findAny", "")
-{
-    REQUIRE(findAny("test line", ",", 0) == std::string::npos);
-    REQUIRE(findAny("test line", " ", 0) == 4U);
-    REQUIRE(findAny("test, line", ", ", 0) == 4U);
-    REQUIRE(findAny("test ,line", ", ", 0) == 4U);
-    REQUIRE(findAny("test, line", " ,", 2) == 4U);
-    REQUIRE(findAny("test ,line", " ,", 3) == 4U);
-    REQUIRE(findAny("\"one\",,two, tree", ",", 5) == 5U);
-}
-
-TEST_CASE("stringuntils escapeString", "")
-{
-    REQUIRE(escapeString("") == "\"\"");
-    REQUIRE(escapeString("1") == "\"1\"");
-    REQUIRE(escapeString(" ") == "\" \"");
-    REQUIRE(escapeString("\"") == "\"\\\"\"");
-    REQUIRE(escapeString("123") == "\"123\"");
-    REQUIRE(escapeString("12\"3") == "\"12\\\"3\"");
-    REQUIRE(escapeString("12\"\"3") == "\"12\\\"\\\"3\"");
-    REQUIRE(escapeString("\"123\"") == "\"\\\"123\\\"\"");
-    REQUIRE(escapeString("\\") == "\"\\\"");
-    REQUIRE(escapeString("12\\3") == "\"12\\3\"");
-}
-
-TEST_CASE("stringuntils sanitizePath", "")
-{
-    std::string path;
-    const std::string sep = dirSeparator;
-    path = "";
-    sanitizePath(path);
-    REQUIRE(path.empty());
-    path = "/";
-    sanitizePath(path);
-    REQUIRE(path == dirSeparator);
-    path = "/\\";
-    sanitizePath(path);
-    REQUIRE(path == dirSeparator);
-    path = "\\/";
-    sanitizePath(path);
-    REQUIRE(path == dirSeparator);
-    path = "//";
-    sanitizePath(path);
-    REQUIRE(path == dirSeparator);
-    path = "///";
-    sanitizePath(path);
-    REQUIRE(path == dirSeparator);
-    path = "//\\/";
-    sanitizePath(path);
-    REQUIRE(path == dirSeparator);
-    path = "///\\";
-    sanitizePath(path);
-    REQUIRE(path == dirSeparator);
-    path = "\\";
-    sanitizePath(path);
-    REQUIRE(path == dirSeparator);
-    path = "\\\\";
-    sanitizePath(path);
-    REQUIRE(path == dirSeparator);
-    path = "\\/\\";
-    sanitizePath(path);
-    REQUIRE(path == dirSeparator);
-    path = "\\\\/";
-    sanitizePath(path);
-    REQUIRE(path == dirSeparator);
-    path = "test";
-    sanitizePath(path);
-    REQUIRE(path == "test");
-    path = "./test";
-    sanitizePath(path);
-    REQUIRE(path == "." + sep + "test");
-    path = "test line";
-    sanitizePath(path);
-    REQUIRE(path == "test line");
-    path = "dir/test";
-    sanitizePath(path);
-    REQUIRE(path == "dir" + sep + "test");
-    path = "/dir/test";
-    sanitizePath(path);
-    REQUIRE(path == sep + "dir" + sep + "test");
-    path = "dir//test";
-    sanitizePath(path);
-    REQUIRE(path == "dir" + sep + "test");
-    path = "dir///test";
-    sanitizePath(path);
-    REQUIRE(path == "dir" + sep + "test");
-    path = "dir///\\test";
-    sanitizePath(path);
-    REQUIRE(path == "dir" + sep + "test");
-    path = "dir/\\//test";
-    sanitizePath(path);
-    REQUIRE(path == "dir" + sep + "test");
-    path = "dir\\test";
-    sanitizePath(path);
-    REQUIRE(path == "dir" + sep + "test");
-    path = "dir/test/";
-    sanitizePath(path);
-    REQUIRE(path == "dir" + sep + "test" + sep);
-    path = "dir/test\\";
-    sanitizePath(path);
-    REQUIRE(path == "dir" + sep + "test" + sep);
-    path = "/very\\long/dir\\with\\sepa/ra/tors";
-    sanitizePath(path);
-    REQUIRE(path == sep + "very" + sep + "long" + sep + \
-        "dir" + sep + "with" + sep + "sepa" + sep + "ra" + sep + "tors");
-    path = "/very\\long/dir\\\\with\\sepa//ra/tors";
-    sanitizePath(path);
-    REQUIRE(path == sep + "very" + sep + "long" + sep + \
-        "dir" + sep + "with" + sep + "sepa" + sep + "ra" + sep + "tors");
-}
-
-TEST_CASE("stringuntils pathJoin1", "")
-{
-    const std::string sep = dirSeparator;
-
-    REQUIRE(pathJoin("", "") == sep);
-    REQUIRE(pathJoin(sep, "") == sep);
-    REQUIRE(pathJoin("", sep) == sep);
-    REQUIRE(pathJoin(sep, sep) == sep);
-    REQUIRE(pathJoin("dir1", "dir2") == "dir1" + sep + "dir2");
-    REQUIRE(pathJoin("dir1" + sep, "dir2") == "dir1" + sep + "dir2");
-    REQUIRE(pathJoin("dir1", sep + "dir2") == "dir1" + sep + "dir2");
-    REQUIRE(pathJoin("dir1" + sep, sep + "dir2") == "dir1" + sep + "dir2");
-    REQUIRE(pathJoin("dir1" + sep + "dir2" + sep + "dir3", "dir4") ==
-        "dir1" + sep + "dir2" + sep + "dir3" + sep + "dir4");
-    REQUIRE(pathJoin("dir1" + sep + "dir2" + sep, "dir3" + sep + "dir4") ==
-        "dir1" + sep + "dir2" + sep + "dir3" + sep + "dir4");
-    REQUIRE(pathJoin("dir1" + sep + "dir2", "dir3" + sep + "dir4") ==
-        "dir1" + sep + "dir2" + sep + "dir3" + sep + "dir4");
-    REQUIRE(pathJoin("dir1" + sep + "dir2", sep + "dir3" + sep + "dir4") ==
-        "dir1" + sep + "dir2" + sep + "dir3" + sep + "dir4");
-}
-
-TEST_CASE("stringuntils pathJoin2", "")
-{
-    const std::string sep = dirSeparator;
-
-    REQUIRE(pathJoin("", "", "") == sep);
-    REQUIRE(pathJoin(sep, "", "") == sep);
-    REQUIRE(pathJoin("", sep, "") == sep);
-    REQUIRE(pathJoin("", "", sep) == sep);
-    REQUIRE(pathJoin(sep, sep, "") == sep);
-    REQUIRE(pathJoin(sep, "", sep) == sep);
-    REQUIRE(pathJoin("", sep, sep) == sep);
-    REQUIRE(pathJoin(sep, sep, sep) == sep);
-
-    REQUIRE(pathJoin("dir1", "dir2", "dir3") ==
-        "dir1" + sep + "dir2" + sep + "dir3");
-    REQUIRE(pathJoin("dir1" + sep, "dir2", "dir3") ==
-        "dir1" + sep + "dir2" + sep + "dir3");
-    REQUIRE(pathJoin("dir1", sep + "dir2", "dir3") ==
-        "dir1" + sep + "dir2" + sep + "dir3");
-    REQUIRE(pathJoin("dir1", "dir2" + sep, "dir3") ==
-        "dir1" + sep + "dir2" + sep + "dir3");
-    REQUIRE(pathJoin("dir1", "dir2", sep + "dir3") ==
-        "dir1" + sep + "dir2" + sep + "dir3");
-    REQUIRE(pathJoin("dir1", "dir2", "dir3" + sep) ==
-        "dir1" + sep + "dir2" + sep + "dir3" + sep);
-    REQUIRE(pathJoin("dir1" + sep, sep + "dir2", "dir3") ==
-        "dir1" + sep + "dir2" + sep + "dir3");
-    REQUIRE(pathJoin("dir1" + sep, "dir2" + sep, "dir3") ==
-        "dir1" + sep + "dir2" + sep + "dir3");
-    REQUIRE(pathJoin("dir1" + sep, "dir2", sep + "dir3") ==
-        "dir1" + sep + "dir2" + sep + "dir3");
-    REQUIRE(pathJoin("dir1" + sep, sep + "dir2" + sep, "dir3") ==
-        "dir1" + sep + "dir2" + sep + "dir3");
-    REQUIRE(pathJoin("dir1" + sep, sep + "dir2", sep + "dir3") ==
-        "dir1" + sep + "dir2" + sep + "dir3");
-    REQUIRE(pathJoin("dir1" + sep, sep + "dir2" + sep, "dir3") ==
-        "dir1" + sep + "dir2" + sep + "dir3");
-    REQUIRE(pathJoin("dir1" + sep, sep + "dir2" + sep, sep + "dir3") ==
-        "dir1" + sep + "dir2" + sep + "dir3");
-    REQUIRE(pathJoin("dir1" + sep + "dir2" + sep + "dir3", "dir4", "dir5") ==
-        "dir1" + sep + "dir2" + sep + "dir3" + sep + "dir4" + sep + "dir5");
-    REQUIRE(pathJoin("dir1" + sep + "dir2" + sep,
-        "dir3" + sep + "dir4",
-        "dir5") ==
-        "dir1" + sep + "dir2" + sep + "dir3" + sep + "dir4" + sep + "dir5");
-    REQUIRE(pathJoin("dir1" + sep + "dir2",
-        "dir3",
-        sep + "dir4" + sep + "dir5") ==
-        "dir1" + sep + "dir2" + sep + "dir3" + sep + "dir4" + sep + "dir5");
-    REQUIRE(pathJoin("dir1" + sep + "dir2",
-        sep + "dir3" + sep + "dir4",
-        sep + "dir5") ==
-        "dir1" + sep + "dir2" + sep + "dir3" + sep + "dir4" + sep + "dir5");
-}
-
-TEST_CASE("stringuntils urlJoin", "")
-{
-    REQUIRE(urlJoin("", "") == "/");
-    REQUIRE(urlJoin("/", "") == "/");
-    REQUIRE(urlJoin("", "/") == "/");
-    REQUIRE(urlJoin("/", "/") == "/");
-    REQUIRE(urlJoin("dir1", "dir2") == "dir1/dir2");
-    REQUIRE(urlJoin("dir1/", "dir2") == "dir1/dir2");
-    REQUIRE(urlJoin("dir1", "/dir2") == "dir1/dir2");
-    REQUIRE(urlJoin("dir1/", "/dir2") == "dir1/dir2");
-    REQUIRE(urlJoin("dir1/dir2/dir3", "dir4") == "dir1/dir2/dir3/dir4");
-    REQUIRE(urlJoin("dir1/dir2/", "dir3/dir4") == "dir1/dir2/dir3/dir4");
-    REQUIRE(urlJoin("dir1/dir2", "dir3/dir4") == "dir1/dir2/dir3/dir4");
-    REQUIRE(urlJoin("dir1/dir2", "/dir3/dir4") == "dir1/dir2/dir3/dir4");
-}
-
-TEST_CASE("stringuntils secureChatCommand", "")
-{
-    std::string str;
-    secureChatCommand(str);
-    REQUIRE(str.empty());
-    str = "test";
-    secureChatCommand(str);
-    REQUIRE(str == "test");
-    str = "test line";
-    secureChatCommand(str);
-    REQUIRE(str == "test line");
-    str = "/test";
-    secureChatCommand(str);
-    REQUIRE(str == "_/test");
-    str = "@test";
-    secureChatCommand(str);
-    REQUIRE(str == "_@test");
-    str = "#test";
-    secureChatCommand(str);
-    REQUIRE(str == "_#test");
-}
-
-#ifdef ENABLE_NLS
-TEST_CASE("stringuntils timeDiffToString", "")
-{
-    REQUIRE(timeDiffToString(60 * 60 * 24 * 7) == "1 week");
-    REQUIRE(timeDiffToString(60 * 60 * 24 * 7 * 2 +
-        60 * 60 * 24 * 3
-        ) == "2 weeks, 3 days");
-    REQUIRE(timeDiffToString(60 * 60 * 24 * 7 * 2 +
-        60 * 60 * 24 * 3 +
-        60 * 60 * 4
-        ) == "2 weeks, 3 days, 4 hours");
-    REQUIRE(timeDiffToString(60 * 60 * 24 * 7 * 2 +
-        60 * 60 * 24 * 3 +
-        60 * 60 * 4 +
-        60 * 7
-        ) == "2 weeks, 3 days, 4 hours, 7 minutes");
-    REQUIRE(timeDiffToString(60 * 60 * 24 * 7 * 2 +
-        60 * 60 * 24 * 3 +
-        60 * 60 * 4 +
-        60 * 7 +
-        10
-        ) == "2 weeks, 3 days, 4 hours, 7 minutes, 10 seconds");
-    REQUIRE(timeDiffToString(5) == "5 seconds");
-    REQUIRE(timeDiffToString(0) == "0 seconds");
-    REQUIRE(timeDiffToString(60 * 60 * 24 * 3
-        ) == "3 days");
-    REQUIRE(timeDiffToString(60 * 60 * 4
-        ) == "4 hours");
-    REQUIRE(timeDiffToString(60 * 7
-        ) == "7 minutes");
-}
-#endif  // ENABLE_NLS
-
-TEST_CASE("stringuntils replaceItemLinks", "")
-{
-    VirtFs::mountDirSilent("data", Append_false);
-    VirtFs::mountDirSilent("../data", Append_false);
-    VirtFs::mountDirSilent("data/test", Append_false);
-    VirtFs::mountDirSilent("../data/test", Append_false);
-
-    ItemDB::NamedItemInfos &namedInfos = ItemDB::getNamedItemInfosTest();
-    ItemDB::ItemInfos &infos = ItemDB::getItemInfosTest();
-    setPathsDefaults(paths);
-    ItemInfo *info = new ItemInfo;
-    info->setId(123456);
-    info->setName("test name 1");
-    namedInfos["test name 1"] = info;
-    infos[123456] = info;
-
-    info = new ItemInfo;
-    info->setId(123);
-    info->setName("test name 2");
-    namedInfos["test name 2"] = info;
-    namedInfos["qqq"] = info;
-    infos[123] = info;
-
-    std::string str;
-
-    SECTION("empty")
-    {
-        str = "test line";
-        replaceItemLinks(str);
-        REQUIRE(str == "test line");
-
-        str = "";
-        replaceItemLinks(str);
-        REQUIRE(str.empty());
-
-        str = "[]";
-        replaceItemLinks(str);
-        REQUIRE(str == "[]");
-
-        str = "[qqq]";
-        replaceItemLinks(str);
-        REQUIRE(str == "[@@123|qqq@@]");
-
-        str = "[,]";
-        replaceItemLinks(str);
-        REQUIRE(str == "[,]");
-
-        str = "[, ]";
-        replaceItemLinks(str);
-        REQUIRE(str == "[, ]");
-    }
-
-    SECTION("simple")
-    {
-        str = "[test name 1]";
-        replaceItemLinks(str);
-        REQUIRE(str == "[@@123456|test name 1@@]");
-
-        str = "text1 [test name 1] text2";
-        replaceItemLinks(str);
-        REQUIRE(str == "text1 [@@123456|test name 1@@] text2");
-
-        str = "[test name 1][test name 1]";
-        replaceItemLinks(str);
-        REQUIRE(str == "[@@123456|test name 1@@][@@123456|test name 1@@]");
-
-        str = "[test name 1] [test name 1]";
-        replaceItemLinks(str);
-        REQUIRE(str == "[@@123456|test name 1@@] [@@123456|test name 1@@]");
-
-        str = "test1 [test name 1]test2[test name 1] test3";
-        replaceItemLinks(str);
-        REQUIRE(str == "test1 [@@123456|test name 1@@]test2"
-            "[@@123456|test name 1@@] test3");
-
-// failing because assert
-//        str = "[test name 1] [no link]";
-//        replaceItemLinks(str);
-//        REQUIRE(str == "[@@123456|test name 1@@] [no link]");
-
-        str = "[test name 1,test name 2]";
-        replaceItemLinks(str);
-        REQUIRE(str == "[@@123456,123|@@]");
-
-        str = "[test name 1, test name 2 ]";
-        replaceItemLinks(str);
-        REQUIRE(str == "[@@123456,123|@@]");
-    }
-
-    SECTION("broken")
-    {
-        str = "[";
-        replaceItemLinks(str);
-        REQUIRE(str == "[");
-
-        str = "]";
-        replaceItemLinks(str);
-        REQUIRE(str == "]");
-
-        str = "][";
-        replaceItemLinks(str);
-        REQUIRE(str == "][");
-
-        str = "]]";
-        replaceItemLinks(str);
-        REQUIRE(str == "]]");
-
-        str = "]t";
-        replaceItemLinks(str);
-        REQUIRE(str == "]t");
-
-        str = "t[";
-        replaceItemLinks(str);
-        REQUIRE(str == "t[");
-
-        str = "t]";
-        replaceItemLinks(str);
-        REQUIRE(str == "t]");
-
-        str = "[[[";
-        replaceItemLinks(str);
-        REQUIRE(str == "[[[");
-
-        str = "[[]";
-        replaceItemLinks(str);
-        REQUIRE(str == "[[]");
-
-        str = "[[t";
-        replaceItemLinks(str);
-        REQUIRE(str == "[[t");
-
-        str = "[][";
-        replaceItemLinks(str);
-        REQUIRE(str == "[][");
-
-        str = "[]]";
-        replaceItemLinks(str);
-        REQUIRE(str == "[]]");
-
-        str = "[]t";
-        replaceItemLinks(str);
-        REQUIRE(str == "[]t");
-
-        str = "[t[";
-        replaceItemLinks(str);
-        REQUIRE(str == "[t[");
-
-// failing because assert
-//        str = "[t]";
-//        replaceItemLinks(str);
-//        REQUIRE(str == "[t]");
-
-        str = "t[[";
-        replaceItemLinks(str);
-        REQUIRE(str == "t[[");
-
-        str = "t[]";
-        replaceItemLinks(str);
-        REQUIRE(str == "t[]");
-
-        str = "t[[";
-        replaceItemLinks(str);
-        REQUIRE(str == "t[[");
-
-        str = "]]]";
-        replaceItemLinks(str);
-        REQUIRE(str == "]]]");
-    }
-
-    SECTION("broken2")
-    {
-        str = "[][]";
-        replaceItemLinks(str);
-        REQUIRE(str == "[][]");
-
-        str = "[[]]";
-        replaceItemLinks(str);
-        REQUIRE(str == "[[]]");
-
-        str = "][[]";
-        replaceItemLinks(str);
-        REQUIRE(str == "][[]");
-    }
-
-    SECTION("broken3")
-    {
-        str = "[[test name 1]]";
-        replaceItemLinks(str);
-        REQUIRE(str == "[[@@123456|test name 1@@]]");
-
-        str = "[[test name 1]";
-        replaceItemLinks(str);
-        REQUIRE(str == "[[@@123456|test name 1@@]");
-
-        str = "[[qqq] name 1]";
-        replaceItemLinks(str);
-        REQUIRE(str == "[[@@123|qqq@@] name 1]");
-
-        str = "[[test name 1]test name 1]";
-        replaceItemLinks(str);
-        REQUIRE(str == "[[@@123456|test name 1@@]test name 1]");
-
-        str = "[[test name 1[]test name 1]";
-        replaceItemLinks(str);
-        REQUIRE(str == "[[test name 1[]test name 1]");
-
-        str = "[[test name 1],test name2,test name 1]";
-        replaceItemLinks(str);
-        REQUIRE(str == "[[@@123456|test name 1@@],test name2,test name 1]");
-
-        str = "[[ test name 1], test name2,test name 1 ]";
-        replaceItemLinks(str);
-        REQUIRE(str == "[[@@123456|test name 1@@], test name2,test name 1 ]");
-
-        str = "[[test name 1,test name2[]test name 1]";
-        replaceItemLinks(str);
-        REQUIRE(str == "[[test name 1,test name2[]test name 1]");
-
-        str = "[[test name 1 ,test name2[] test name 1]";
-        replaceItemLinks(str);
-        REQUIRE(str == "[[test name 1 ,test name2[] test name 1]");
-    }
-    ResourceManager::deleteInstance();
-    delete_all(infos);
-    infos.clear();
-    namedInfos.clear();
-    VirtFs::unmountDirSilent("data");
-    VirtFs::unmountDirSilent("../data");
-    VirtFs::unmountDirSilent("data/test");
-    VirtFs::unmountDirSilent("../data/test");
-}
diff --git a/src/unittests/utils/timer.cc b/src/unittests/utils/timer.cc
deleted file mode 100644
index b5cfc692e..000000000
--- a/src/unittests/utils/timer.cc
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2012-2017  The ManaPlus Developers
- *
- *  This file is part of The ManaPlus Client.
- *
- *  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
- *  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, see <http://www.gnu.org/licenses/>.
- */
-
-#include "unittests/unittests.h"
-
-#include "const/utils/timer.h"
-
-#include "utils/timer.h"
-
-#include <climits>
-
-#include "debug.h"
-
-static const int MAX_TICK_VALUE = INT_MAX / 2;
-
-TEST_CASE("timer const", "")
-{
-    REQUIRE(MILLISECONDS_IN_A_TICK != 0);
-}
-
-TEST_CASE("timer get_elapsed_time", "")
-{
-    tick_time = 0;
-    REQUIRE(get_elapsed_time(0) == 0);
-    REQUIRE(get_elapsed_time(MAX_TICK_VALUE - 1) == 1 * MILLISECONDS_IN_A_TICK);
-    REQUIRE(get_elapsed_time(MAX_TICK_VALUE - 2) == 2 * MILLISECONDS_IN_A_TICK);
-
-    tick_time = 1;
-    REQUIRE(get_elapsed_time(0) == 1 * MILLISECONDS_IN_A_TICK);
-    REQUIRE(get_elapsed_time(1) == 0 * MILLISECONDS_IN_A_TICK);
-    REQUIRE(get_elapsed_time(MAX_TICK_VALUE - 1) == 2 * MILLISECONDS_IN_A_TICK);
-    REQUIRE(get_elapsed_time(MAX_TICK_VALUE - 2) == 3 * MILLISECONDS_IN_A_TICK);
-
-    tick_time = 10;
-    REQUIRE(get_elapsed_time(0) == 10 * MILLISECONDS_IN_A_TICK);
-    REQUIRE(get_elapsed_time(10) == 0 * MILLISECONDS_IN_A_TICK);
-    REQUIRE(get_elapsed_time(MAX_TICK_VALUE - 1) ==
-        11 * MILLISECONDS_IN_A_TICK);
-
-    tick_time = 10000;
-    REQUIRE(get_elapsed_time(0) == 10000 * MILLISECONDS_IN_A_TICK);
-    REQUIRE(get_elapsed_time(10) == 9990 * MILLISECONDS_IN_A_TICK);
-    REQUIRE(get_elapsed_time(10000) == 0 * MILLISECONDS_IN_A_TICK);
-    REQUIRE(get_elapsed_time(MAX_TICK_VALUE - 1) ==
-        10001 * MILLISECONDS_IN_A_TICK);
-}
-
-TEST_CASE("timer get_elapsed_time1", "")
-{
-    tick_time = 0;
-    REQUIRE(get_elapsed_time1(0) == 0);
-    REQUIRE(get_elapsed_time1(MAX_TICK_VALUE - 1) == 1);
-    REQUIRE(get_elapsed_time1(MAX_TICK_VALUE - 2) == 2);
-
-    tick_time = 1;
-    REQUIRE(get_elapsed_time1(0) == 1);
-    REQUIRE(get_elapsed_time1(1) == 0);
-    REQUIRE(get_elapsed_time1(MAX_TICK_VALUE - 1) == 2);
-    REQUIRE(get_elapsed_time1(MAX_TICK_VALUE - 2) == 3);
-
-    tick_time = 10;
-    REQUIRE(get_elapsed_time1(0) == 10);
-    REQUIRE(get_elapsed_time1(10) == 0);
-    REQUIRE(get_elapsed_time1(MAX_TICK_VALUE - 1) == 11);
-
-    tick_time = 10000;
-    REQUIRE(get_elapsed_time1(0) == 10000);
-    REQUIRE(get_elapsed_time1(10) == 9990);
-    REQUIRE(get_elapsed_time1(10000) == 0);
-    REQUIRE(get_elapsed_time1(MAX_TICK_VALUE - 1) == 10001);
-}
diff --git a/src/unittests/utils/translation/poparser.cc b/src/unittests/utils/translation/poparser.cc
deleted file mode 100644
index 3e697582b..000000000
--- a/src/unittests/utils/translation/poparser.cc
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2016-2017  The ManaPlus Developers
- *
- *  This file is part of The ManaPlus Client.
- *
- *  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
- *  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, see <http://www.gnu.org/licenses/>.
- */
-
-#include "unittests/unittests.h"
-
-#include "client.h"
-#include "configuration.h"
-#include "configmanager.h"
-#include "dirs.h"
-#include "graphicsmanager.h"
-
-#include "being/actorsprite.h"
-
-#include "fs/virtfs/fs.h"
-
-#include "gui/gui.h"
-#include "gui/theme.h"
-
-#include "utils/delete2.h"
-#include "utils/env.h"
-
-#include "utils/translation/podict.h"
-#include "utils/translation/poparser.h"
-
-#include "render/sdlgraphics.h"
-
-#include "resources/sdlimagehelper.h"
-
-#include "debug.h"
-
-TEST_CASE("PoParser tests", "PoParser")
-{
-    setEnv("SDL_VIDEODRIVER", "dummy");
-
-    client = new Client;
-    VirtFs::mountDirSilent("data", Append_false);
-    VirtFs::mountDirSilent("../data", Append_false);
-
-    mainGraphics = new SDLGraphics;
-    imageHelper = new SDLImageHelper();
-
-    Dirs::initRootDir();
-    Dirs::initHomeDir();
-
-    ConfigManager::initConfiguration();
-    setConfigDefaults2(config);
-    setBrandingDefaults(branding);
-
-#ifdef USE_SDL2
-    SDLImageHelper::setRenderer(graphicsManager.createRenderer(
-        graphicsManager.createWindow(640, 480, 0,
-        SDL_WINDOW_SHOWN | SDL_SWSURFACE), SDL_RENDERER_SOFTWARE));
-#else  // USE_SDL2
-
-    graphicsManager.createWindow(640, 480, 0, SDL_ANYFORMAT | SDL_SWSURFACE);
-#endif  // USE_SDL2
-
-    theme = new Theme;
-    Theme::selectSkin();
-
-    ActorSprite::load();
-    gui = new Gui();
-    gui->postInit(mainGraphics);
-
-    SECTION("PoParser empty")
-    {
-        PoParser *parser = new PoParser;
-        PoDict *dict = parser->load("ru",
-            "unknownfilename.po",
-            nullptr);
-
-        REQUIRE(dict != nullptr);
-        REQUIRE(dict->getMap() != nullptr);
-        REQUIRE(dict->getMap()->empty());
-
-        delete parser;
-        delete dict;
-    }
-
-    SECTION("PoParser normal")
-    {
-        PoParser *parser = new PoParser;
-        PoDict *dict = parser->load("ru",
-            "test/test1",
-            nullptr);
-
-        REQUIRE(dict != nullptr);
-        REQUIRE(dict->getMap() != nullptr);
-        REQUIRE(dict->getMap()->size() == 1786);
-        REQUIRE(dict->getStr("Unknown skill message.") ==
-            "Неизвестная ошибка скилов.");
-        REQUIRE(dict->getStr("Full strip failed because of coating.") ==
-            "Full strip failed because of coating.");
-        REQUIRE(dict->getStr("You picked up %d [@@%d|%s@@].") ==
-            "Вы подняли %d [@@%d|%s@@].");
-
-        delete parser;
-        delete dict;
-    }
-
-    SECTION("PoParser fuzzy")
-    {
-        PoParser *parser = new PoParser;
-        PoDict *dict = parser->load("ru",
-            "test/test1",
-            nullptr);
-
-        REQUIRE(dict != nullptr);
-        REQUIRE(dict->getMap() != nullptr);
-        REQUIRE(dict->getMap()->size() == 1786);
-        REQUIRE(dict->getStr("Atk +100%.") == "Atk +100%.");
-
-        delete parser;
-        delete dict;
-    }
-    delete2(client);
-    VirtFs::unmountDirSilent("data");
-    VirtFs::unmountDirSilent("../data");
-}
diff --git a/src/unittests/utils/xml.cc b/src/unittests/utils/xml.cc
deleted file mode 100644
index 8605e0640..000000000
--- a/src/unittests/utils/xml.cc
+++ /dev/null
@@ -1,393 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2014-2017  The ManaPlus Developers
- *
- *  This file is part of The ManaPlus Client.
- *
- *  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
- *  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, see <http://www.gnu.org/licenses/>.
- */
-
-#include "unittests/unittests.h"
-
-#include "client.h"
-#include "configuration.h"
-#include "configmanager.h"
-#include "dirs.h"
-#include "graphicsmanager.h"
-
-#include "being/actorsprite.h"
-
-#include "fs/virtfs/fs.h"
-
-#include "gui/gui.h"
-#include "gui/theme.h"
-
-#include "utils/delete2.h"
-#include "utils/env.h"
-#ifdef ENABLE_PUGIXML
-#include "utils/xmlwriter.h"
-#endif  // ENABLE_PUGIXML
-
-#include "render/sdlgraphics.h"
-
-#include "resources/sdlimagehelper.h"
-
-#include "resources/resourcemanager/resourcemanager.h"
-
-#include "debug.h"
-
-TEST_CASE("xml test1", "")
-{
-    REQUIRE(client == nullptr);
-    REQUIRE(gui == nullptr);
-    ResourceManager::cleanOrphans(true);
-    ResourceManager::deleteInstance();
-}
-
-TEST_CASE("xml doc", "")
-{
-    setEnv("SDL_VIDEODRIVER", "dummy");
-
-    client = new Client;
-    XML::initXML();
-    VirtFs::mountDirSilent("data", Append_false);
-    VirtFs::mountDirSilent("../data", Append_false);
-    mainGraphics = new SDLGraphics;
-    imageHelper = new SDLImageHelper();
-
-    Dirs::initRootDir();
-    Dirs::initHomeDir();
-
-    ConfigManager::initConfiguration();
-    setConfigDefaults2(config);
-    setBrandingDefaults(branding);
-
-#ifdef USE_SDL2
-    SDLImageHelper::setRenderer(graphicsManager.createRenderer(
-        graphicsManager.createWindow(640, 480, 0,
-        SDL_WINDOW_SHOWN | SDL_SWSURFACE), SDL_RENDERER_SOFTWARE));
-#else  // USE_SDL2
-
-    graphicsManager.createWindow(640, 480, 0, SDL_ANYFORMAT | SDL_SWSURFACE);
-#endif  // USE_SDL2
-
-    theme = new Theme;
-    Theme::selectSkin();
-
-    const char *const tempXmlName = "tempxml.xml";
-    ActorSprite::load();
-    gui = new Gui();
-    gui->postInit(mainGraphics);
-
-    SECTION("load1")
-    {
-        XML::Document doc("graphics/gui/browserbox.xml",
-            UseVirtFs_true,
-            SkipError_false);
-        REQUIRE(doc.isLoaded() == true);
-        REQUIRE(doc.isValid() == true);
-        REQUIRE(doc.rootNode() != nullptr);
-        REQUIRE(xmlNameEqual(doc.rootNode(), "skinset") == true);
-        REQUIRE(xmlNameEqual(doc.rootNode(), "skinset123") == false);
-        REQUIRE(xmlTypeEqual(doc.rootNode(), XML_ELEMENT_NODE) == true);
-//        REQUIRE(XmlHaveChildContent(doc.rootNode()) == true);
-    }
-
-    SECTION("load2")
-    {
-        const char *const xml = "<?xml version=\"1.0\" encoding=\"utf-8\"?>"
-            "<root><data option1=\"false\" option2=\"true\"/>"
-            "<cont>this is test</cont></root>";
-        XML::Document doc(xml, strlen(xml));
-        REQUIRE(doc.isLoaded() == true);
-        REQUIRE(doc.isValid() == true);
-        REQUIRE(doc.rootNode() != nullptr);
-        REQUIRE(xmlNameEqual(doc.rootNode(), "root") == true);
-        REQUIRE(xmlNameEqual(doc.rootNode(), "root123") == false);
-        REQUIRE(xmlTypeEqual(doc.rootNode(), XML_ELEMENT_NODE) == true);
-        REQUIRE(XmlHasProp(doc.rootNode(), "option1") == false);
-        REQUIRE(XmlHasProp(doc.rootNode(), "option123") == false);
-        REQUIRE(XmlHaveChildContent(doc.rootNode()) == false);
-    }
-
-    SECTION("load3")
-    {
-        const std::string xml = "<?xml version=\"1.0\" encoding=\"utf-8\"?>"
-            "<!-- comment here\nand here -->"
-            "<root><data option1=\"false\" option2=\"true\"/></root>";
-        XML::Document doc(xml.c_str(), xml.size());
-        REQUIRE(doc.isLoaded() == true);
-        REQUIRE(doc.isValid() == true);
-        REQUIRE(doc.rootNode() != nullptr);
-        REQUIRE(xmlNameEqual(doc.rootNode(), "root") == true);
-        REQUIRE(xmlNameEqual(doc.rootNode(), "root123") == false);
-        REQUIRE(xmlTypeEqual(doc.rootNode(), XML_ELEMENT_NODE) == true);
-        REQUIRE(XmlHasProp(doc.rootNode(), "option1") == false);
-        REQUIRE(XmlHasProp(doc.rootNode(), "option123") == false);
-        REQUIRE(XmlHaveChildContent(doc.rootNode()) == false);
-    }
-
-    SECTION("load4")
-    {
-        const char *const xml = "<?xml version=\"1.0\" encoding=\"utf-8\"?>"
-            "<root>this is test</root>";
-        XML::Document doc(xml, strlen(xml));
-        REQUIRE(doc.isLoaded() == true);
-        REQUIRE(doc.isValid() == true);
-        REQUIRE(doc.rootNode() != nullptr);
-        REQUIRE(xmlNameEqual(doc.rootNode(), "root") == true);
-        REQUIRE(xmlNameEqual(doc.rootNode(), "root123") == false);
-        REQUIRE(xmlTypeEqual(doc.rootNode(), XML_ELEMENT_NODE) == true);
-        REQUIRE(XmlHasProp(doc.rootNode(), "option1") == false);
-        REQUIRE(XmlHasProp(doc.rootNode(), "option123") == false);
-        REQUIRE(XmlHaveChildContent(doc.rootNode()) == true);
-        REQUIRE(!strcmp(XmlChildContent(doc.rootNode()), "this is test"));
-    }
-
-    SECTION("properties")
-    {
-        XML::Document doc("graphics/gui/browserbox.xml",
-            UseVirtFs_true,
-            SkipError_false);
-
-        XmlNodeConstPtr rootNode = doc.rootNode();
-        REQUIRE(XML::getProperty(rootNode, "image", "") == "window.png");
-    }
-
-    SECTION("for each")
-    {
-        XML::Document doc("graphics/gui/browserbox.xml",
-            UseVirtFs_true,
-            SkipError_false);
-
-        XmlNodeConstPtr rootNode = doc.rootNode();
-//        REQUIRE(XmlHaveChildContent(rootNode) == true);
-        XmlNodePtr node = XmlNodeDefault;
-        for_each_xml_child_node(widgetNode, rootNode)
-        {
-            node = widgetNode;
-            if (xmlNameEqual(node, "widget"))
-                break;
-        }
-        REQUIRE(node != nullptr);
-        REQUIRE(xmlTypeEqual(node, XML_ELEMENT_NODE) == true);
-        REQUIRE(xmlNameEqual(node, "widget") == true);
-//        REQUIRE(XmlHaveChildContent(node) == true);
-        for_each_xml_child_node(optionNode, node)
-        {
-            node = optionNode;
-            if (xmlNameEqual(node, "option"))
-                break;
-        }
-        REQUIRE(node != nullptr);
-        REQUIRE(xmlTypeEqual(node, XML_ELEMENT_NODE) == true);
-        REQUIRE(xmlNameEqual(node, "option") == true);
-        REQUIRE(XmlHaveChildContent(node) == false);
-        REQUIRE(XmlHasProp(node, "name") == true);
-        REQUIRE(XmlHasProp(node, "value") == true);
-        REQUIRE(XmlHasProp(node, "option123") == false);
-        REQUIRE(XML::getProperty(node, "name", "") == "padding");
-        REQUIRE(XML::langProperty(node, "name", "") == "padding");
-        REQUIRE(XML::getProperty(node, "value", 0) == 1);
-        REQUIRE(XML::getBoolProperty(node, "value", true) == true);
-        REQUIRE(XML::getBoolProperty(node, "value", false) == false);
-        REQUIRE(XML::getIntProperty(node, "value", -1, -10, 100) == 1);
-    }
-
-    SECTION("child1")
-    {
-        XML::Document doc("graphics/gui/browserbox.xml",
-            UseVirtFs_true,
-            SkipError_false);
-
-        XmlNodeConstPtr rootNode = doc.rootNode();
-        XmlNodePtr node = XML::findFirstChildByName(rootNode, "widget");
-        REQUIRE(node != nullptr);
-        REQUIRE(xmlTypeEqual(node, XML_ELEMENT_NODE) == true);
-        REQUIRE(xmlNameEqual(node, "widget") == true);
-//        REQUIRE(XmlHaveChildContent(node) == true);
-        node = XML::findFirstChildByName(node, "option");
-        REQUIRE(node != nullptr);
-        REQUIRE(xmlTypeEqual(node, XML_ELEMENT_NODE) == true);
-        REQUIRE(xmlNameEqual(node, "option") == true);
-        REQUIRE(XmlHaveChildContent(node) == false);
-        REQUIRE(XmlHasProp(node, "name") == true);
-        REQUIRE(XmlHasProp(node, "value") == true);
-        REQUIRE(XmlHasProp(node, "option123") == false);
-        REQUIRE(XML::getProperty(node, "name", "") == "padding");
-        REQUIRE(XML::langProperty(node, "name", "") == "padding");
-        REQUIRE(XML::langProperty(node, "name123", "").empty());
-        REQUIRE(XML::getProperty(node, "value", 0) == 1);
-        REQUIRE(XML::getProperty(node, "value123", -1) == -1);
-        REQUIRE(XML::getBoolProperty(node, "value", true) == true);
-        REQUIRE(XML::getBoolProperty(node, "value", false) == false);
-        REQUIRE(XML::getBoolProperty(node, "value123", true) == true);
-        REQUIRE(XML::getIntProperty(node, "value", -1, -10, 100) == 1);
-        REQUIRE(XML::getIntProperty(node, "value123", -1, -10, 100) == -1);
-    }
-
-    SECTION("child2")
-    {
-        const char *const xml = "<?xml version=\"1.0\" encoding=\"utf-8\"?>"
-            "<root><data option1=\"false\" option2=\"true\" "
-            "option3=\"10.5\"/></root>";
-        XML::Document doc(xml, strlen(xml));
-        XmlNodeConstPtr rootNode = doc.rootNode();
-        REQUIRE(XmlHaveChildContent(rootNode) == false);
-        XmlNodePtr node = XML::findFirstChildByName(rootNode, "data");
-        REQUIRE(node != nullptr);
-        REQUIRE(xmlTypeEqual(node, XML_ELEMENT_NODE) == true);
-        REQUIRE(xmlNameEqual(node, "data") == true);
-        REQUIRE(XmlHaveChildContent(node) == false);
-        REQUIRE(XmlHasProp(node, "option1") == true);
-        REQUIRE(XmlHasProp(node, "option123") == false);
-        REQUIRE(XML::getBoolProperty(node, "option1", true) == false);
-        REQUIRE(XML::getBoolProperty(node, "option2", false) == true);
-        const float opt3 = XML::getFloatProperty(node, "option3", 0.0);
-        REQUIRE(opt3 > 10);
-        REQUIRE(opt3 < 11);
-    }
-
-    SECTION("child3")
-    {
-        const std::string xml = "<?xml version=\"1.0\" encoding=\"utf-8\"?>"
-            "<!-- comment --><root><!-- comment -->"
-            "<data option1=\"false\" option2=\"true\" "
-            "option3=\"10.5\"/><!-- comment --></root>";
-        XML::Document doc(xml.c_str(), xml.size());
-        XmlNodeConstPtr rootNode = doc.rootNode();
-//        REQUIRE(XmlHaveChildContent(rootNode) == true);
-        XmlNodePtr node = XML::findFirstChildByName(rootNode, "data");
-        REQUIRE(node != nullptr);
-        REQUIRE(xmlTypeEqual(node, XML_ELEMENT_NODE) == true);
-        REQUIRE(xmlNameEqual(node, "data") == true);
-        REQUIRE(XmlHaveChildContent(node) == false);
-        REQUIRE(XmlHasProp(node, "option1") == true);
-        REQUIRE(XmlHasProp(node, "option123") == false);
-        REQUIRE(XML::getBoolProperty(node, "option1", true) == false);
-        REQUIRE(XML::getBoolProperty(node, "option2", false) == true);
-        const float opt3 = XML::getFloatProperty(node, "option3", 0.0);
-        REQUIRE(opt3 > 10);
-        REQUIRE(opt3 < 11);
-    }
-
-    SECTION("validate")
-    {
-//        REQUIRE(XML::Document::validateXml(
-//            "graphics/gui/browserbox.xml") == true);
-        REQUIRE(XML::Document::validateXml(
-            "graphics/gui/bubble.png") == false);
-        REQUIRE(XML::Document::validateXml(
-            "graphics/gui/testfile123.xml") == false);
-    }
-
-    SECTION("save1")
-    {
-        // clean
-        ::remove(tempXmlName);
-
-        // save
-        FILE *const testFile = fopen(tempXmlName, "w");
-        REQUIRE(testFile);
-        fclose(testFile);
-        XmlTextWriterPtr writer = XmlNewTextWriterFilename(
-            tempXmlName,
-            0);
-        XmlTextWriterSetIndent(writer, 1);
-        XmlTextWriterStartDocument(writer, nullptr, nullptr, nullptr);
-        XmlTextWriterStartRootElement(writer, "root");
-        XmlTextWriterEndDocument(writer);
-        XmlSaveTextWriterFilename(writer, tempXmlName);
-        XmlFreeTextWriter(writer);
-
-        // load
-        XML::Document doc(tempXmlName,
-            UseVirtFs_false,
-            SkipError_false);
-        REQUIRE(doc.isLoaded() == true);
-        REQUIRE(doc.isValid() == true);
-        REQUIRE(doc.rootNode() != nullptr);
-        REQUIRE(xmlNameEqual(doc.rootNode(), "root") == true);
-        REQUIRE(xmlNameEqual(doc.rootNode(), "skinset123") == false);
-        REQUIRE(xmlTypeEqual(doc.rootNode(), XML_ELEMENT_NODE) == true);
-//        REQUIRE(XmlHaveChildContent(doc.rootNode()) == true);
-
-        // clean again
-        ::remove(tempXmlName);
-    }
-
-    SECTION("save2")
-    {
-        // clean
-        ::remove(tempXmlName);
-
-        // save
-        FILE *const testFile = fopen(tempXmlName, "w");
-        REQUIRE(testFile);
-        fclose(testFile);
-        XmlTextWriterPtr writer = XmlNewTextWriterFilename(
-            tempXmlName,
-            0);
-        XmlTextWriterSetIndent(writer, 1);
-        XmlTextWriterStartDocument(writer, nullptr, nullptr, nullptr);
-        XmlTextWriterStartRootElement(writer, "root");
-
-        XmlTextWriterStartElement(writer, "option");
-        XmlTextWriterWriteAttribute(writer, "name", "the name");
-        XmlTextWriterWriteAttribute(writer, "value", "the value");
-        XmlTextWriterEndElement(writer);
-
-        XmlTextWriterEndDocument(writer);
-        XmlSaveTextWriterFilename(writer, tempXmlName);
-        XmlFreeTextWriter(writer);
-
-        // load
-        XML::Document doc(tempXmlName,
-            UseVirtFs_false,
-            SkipError_false);
-        REQUIRE(doc.isLoaded() == true);
-        REQUIRE(doc.isValid() == true);
-        REQUIRE(doc.rootNode() != nullptr);
-        REQUIRE(xmlNameEqual(doc.rootNode(), "root") == true);
-        REQUIRE(xmlNameEqual(doc.rootNode(), "skinset123") == false);
-        REQUIRE(xmlTypeEqual(doc.rootNode(), XML_ELEMENT_NODE) == true);
-//        REQUIRE(XmlHaveChildContent(doc.rootNode()) == true);
-        XmlNodePtr node = XML::findFirstChildByName(doc.rootNode(), "option");
-        REQUIRE(node != nullptr);
-        REQUIRE(xmlTypeEqual(node, XML_ELEMENT_NODE) == true);
-        REQUIRE(xmlNameEqual(node, "option") == true);
-        REQUIRE(XmlHaveChildContent(node) == false);
-        REQUIRE(XmlHasProp(node, "name") == true);
-        REQUIRE(XmlHasProp(node, "value") == true);
-        REQUIRE(XmlHasProp(node, "option123") == false);
-        REQUIRE(XML::getProperty(node, "name", "") == "the name");
-        REQUIRE(XML::getProperty(node, "value", "") == "the value");
-
-        // clean again
-        ::remove(tempXmlName);
-    }
-
-    delete2(theme);
-    delete2(client);
-    ResourceManager::deleteInstance();
-    VirtFs::unmountDirSilent("data");
-    VirtFs::unmountDirSilent("../data");
-}
-
-TEST_CASE("xml test2", "")
-{
-    REQUIRE(gui == nullptr);
-    ResourceManager::cleanOrphans(true);
-    ResourceManager::deleteInstance();
-}
diff --git a/src/unittests/utils/xmlutils.cc b/src/unittests/utils/xmlutils.cc
deleted file mode 100644
index 23df65a10..000000000
--- a/src/unittests/utils/xmlutils.cc
+++ /dev/null
@@ -1,225 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2014-2017  The ManaPlus Developers
- *
- *  This file is part of The ManaPlus Client.
- *
- *  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
- *  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, see <http://www.gnu.org/licenses/>.
- */
-
-#include "unittests/unittests.h"
-
-#include "client.h"
-#include "configmanager.h"
-#include "configuration.h"
-#include "dirs.h"
-#include "graphicsmanager.h"
-
-#include "being/actorsprite.h"
-
-#include "fs/virtfs/fs.h"
-
-#include "gui/userpalette.h"
-#include "gui/theme.h"
-
-#include "utils/delete2.h"
-#include "utils/env.h"
-#include "utils/xmlutils.h"
-
-#include "render/sdlgraphics.h"
-
-#include "resources/resourcemanager/resourcemanager.h"
-
-#include "resources/sdlimagehelper.h"
-
-#include "debug.h"
-
-TEST_CASE("xmlutils readXmlIntVector 1", "")
-{
-    setEnv("SDL_VIDEODRIVER", "dummy");
-
-    client = new Client;
-    XML::initXML();
-    VirtFs::mountDirSilent("data", Append_false);
-    VirtFs::mountDirSilent("../data", Append_false);
-
-    mainGraphics = new SDLGraphics;
-    imageHelper = new SDLImageHelper();
-
-    Dirs::initHomeDir();
-
-    setBrandingDefaults(branding);
-    ConfigManager::initConfiguration();
-
-#ifdef USE_SDL2
-    SDLImageHelper::setRenderer(graphicsManager.createRenderer(
-        graphicsManager.createWindow(640, 480, 0,
-        SDL_WINDOW_SHOWN | SDL_SWSURFACE), SDL_RENDERER_SOFTWARE));
-#else  // USE_SDL2
-
-    graphicsManager.createWindow(640, 480, 0, SDL_ANYFORMAT | SDL_SWSURFACE);
-#endif  // USE_SDL2
-
-    userPalette = new UserPalette;
-
-    Dirs::initRootDir();
-    theme = new Theme;
-    Theme::selectSkin();
-
-    ActorSprite::load();
-
-    STD_VECTOR<int> arr;
-
-    readXmlIntVector("graphics/gui/browserbox.xml",
-        "skinset",
-        "widget",
-        "option",
-        "value",
-        arr,
-        SkipError_false);
-
-    REQUIRE(5 == arr.size());
-    REQUIRE(1 == arr[0]);
-    REQUIRE(15 == arr[1]);
-    REQUIRE(0 == arr[2]);
-    REQUIRE(1 == arr[3]);
-    REQUIRE(1 == arr[4]);
-
-    delete2(userPalette);
-    delete2(theme);
-    delete2(client);
-    ResourceManager::deleteInstance();
-    VirtFs::unmountDirSilent("data");
-    VirtFs::unmountDirSilent("../data");
-}
-
-TEST_CASE("xmlutils readXmlStringMap 1", "")
-{
-    setEnv("SDL_VIDEODRIVER", "dummy");
-
-    client = new Client;
-    XML::initXML();
-    VirtFs::mountDirSilent("data", Append_false);
-    VirtFs::mountDirSilent("../data", Append_false);
-
-    mainGraphics = new SDLGraphics;
-    imageHelper = new SDLImageHelper();
-
-    Dirs::initRootDir();
-    Dirs::initHomeDir();
-
-    setBrandingDefaults(branding);
-    ConfigManager::initConfiguration();
-
-#ifdef USE_SDL2
-    SDLImageHelper::setRenderer(graphicsManager.createRenderer(
-        graphicsManager.createWindow(640, 480, 0,
-        SDL_WINDOW_SHOWN | SDL_SWSURFACE), SDL_RENDERER_SOFTWARE));
-#else  // USE_SDL2
-
-    graphicsManager.createWindow(640, 480, 0, SDL_ANYFORMAT | SDL_SWSURFACE);
-#endif  // USE_SDL2
-
-    userPalette = new UserPalette;
-
-    theme = new Theme;
-    Theme::selectSkin();
-
-    ActorSprite::load();
-
-    std::map<std::string, std::string> arr;
-
-    readXmlStringMap("graphics/sprites/manaplus_emotes.xml",
-        "emotes",
-        "emote",
-        "sprite",
-        "name",
-        "variant",
-        arr,
-        SkipError_false);
-
-    REQUIRE(arr.size() == 27);
-    REQUIRE(arr["Kitty"] == "0");
-    REQUIRE(arr["xD"] == "1");
-    REQUIRE(arr["Metal"] == "26");
-
-    delete2(userPalette);
-    delete2(theme);
-    delete2(client);
-    ResourceManager::deleteInstance();
-    VirtFs::unmountDirSilent("data");
-    VirtFs::unmountDirSilent("../data");
-}
-
-TEST_CASE("xmlutils readXmlIntMap 1", "")
-{
-    setEnv("SDL_VIDEODRIVER", "dummy");
-
-    client = new Client;
-    XML::initXML();
-    VirtFs::mountDirSilent("data", Append_false);
-    VirtFs::mountDirSilent("../data", Append_false);
-    VirtFs::mountDirSilent("data/test", Append_false);
-    VirtFs::mountDirSilent("../data/test", Append_false);
-
-    mainGraphics = new SDLGraphics;
-    imageHelper = new SDLImageHelper();
-
-    Dirs::initRootDir();
-    Dirs::initHomeDir();
-
-    setBrandingDefaults(branding);
-    ConfigManager::initConfiguration();
-
-#ifdef USE_SDL2
-    SDLImageHelper::setRenderer(graphicsManager.createRenderer(
-        graphicsManager.createWindow(640, 480, 0,
-        SDL_WINDOW_SHOWN | SDL_SWSURFACE), SDL_RENDERER_SOFTWARE));
-#else  // USE_SDL2
-
-    graphicsManager.createWindow(640, 480, 0, SDL_ANYFORMAT | SDL_SWSURFACE);
-#endif  // USE_SDL2
-
-    userPalette = new UserPalette;
-
-    theme = new Theme;
-    Theme::selectSkin();
-
-    ActorSprite::load();
-
-    std::map<int32_t, int32_t> arr;
-
-    readXmlIntMap("testintmap.xml",
-        "tests",
-        "sub",
-        "item",
-        "id",
-        "val",
-        arr,
-        SkipError_false);
-
-    REQUIRE(arr.size() == 3);
-    REQUIRE(arr[1] == 2);
-    REQUIRE(arr[10] == 20);
-    REQUIRE(arr[3] == 0);
-
-    delete2(userPalette);
-    delete2(theme);
-    delete2(client);
-    ResourceManager::deleteInstance();
-    VirtFs::unmountDirSilent("data/test");
-    VirtFs::unmountDirSilent("../data/test");
-    VirtFs::unmountDirSilent("data");
-    VirtFs::unmountDirSilent("../data");
-}