diff --git a/BoostTestAdapter/Boost/Results/BoostStandardOutput.cs b/BoostTestAdapter/Boost/Results/BoostStandardOutput.cs
index 600bf4c..e8f1d2c 100644
--- a/BoostTestAdapter/Boost/Results/BoostStandardOutput.cs
+++ b/BoostTestAdapter/Boost/Results/BoostStandardOutput.cs
@@ -1,41 +1,41 @@
-// (C) Copyright ETAS 2015.
-// 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)
-
-using System.Collections.Generic;
+// (C) Copyright ETAS 2015.
+// 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)
+
+using System.Collections.Generic;
 using BoostTestAdapter.Boost.Results.LogEntryTypes;
 
-namespace BoostTestAdapter.Boost.Results
-{
-    /// <summary>
-    /// Standard Output as emitted by Boost Test executables
-    /// </summary>
-    public class BoostStandardOutput : BoostConsoleOutputBase
-    {
-        #region Constructors
-
-        /// <summary>
-        /// Constructor accepting a path to the external file
-        /// </summary>
-        /// <param name="target">The destination result collection. Possibly used for result aggregation.</param>
-        public BoostStandardOutput(IDictionary<string, TestResult> target)
-            : base(target)
-        {
-        }
-        
-        #endregion Constructors
-
-        #region BoostConsoleOutputBase
-
-        protected override LogEntry CreateLogEntry(string message)
-        {
-            return new LogEntryStandardOutputMessage()
-            {
-                Detail = message
-            };
-        }
-
-        #endregion BoostConsoleOutputBase
-    }
+namespace BoostTestAdapter.Boost.Results
+{
+    /// <summary>
+    /// Standard Output as emitted by Boost Test executables
+    /// </summary>
+    public class BoostStandardOutput : BoostConsoleOutputBase
+    {
+        #region Constructors
+
+        /// <summary>
+        /// Constructor accepting a path to the external file
+        /// </summary>
+        /// <param name="target">The destination result collection. Possibly used for result aggregation.</param>
+        public BoostStandardOutput(IDictionary<string, TestResult> target)
+            : base(target)
+        {
+        }
+        
+        #endregion Constructors
+
+        #region BoostConsoleOutputBase
+
+        protected override LogEntry CreateLogEntry(string message)
+        {
+            return new LogEntryStandardOutputMessage()
+            {
+                Detail = message
+            };
+        }
+
+        #endregion BoostConsoleOutputBase
+    }
 }
\ No newline at end of file
diff --git a/BoostTestAdapter/Boost/Test/TestFrameworkDOTDeserialiser.cs b/BoostTestAdapter/Boost/Test/TestFrameworkDOTDeserialiser.cs
index 94eff63..ec8a92e 100644
--- a/BoostTestAdapter/Boost/Test/TestFrameworkDOTDeserialiser.cs
+++ b/BoostTestAdapter/Boost/Test/TestFrameworkDOTDeserialiser.cs
@@ -1,545 +1,506 @@
-// (C) Copyright ETAS 2015.
-// 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)
-
-using System;
-using System.IO;
-using System.Linq;
-using System.Globalization;
-using System.Collections.Generic;
-
-using Antlr.DOT;
-using Antlr4.Runtime.Tree;
-using Antlr4.Runtime.Misc;
-
-using BoostTestAdapter.Utility;
-
-namespace BoostTestAdapter.Boost.Test
-{
-    /// <summary>
-    /// A Test Framework deserialiser which generates a 
-    /// Test Framework instance from a Boost Test DOT representation.
-    /// </summary>
-    public class TestFrameworkDOTDeserialiser
-    {
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        /// <param name="source">The test module source file path</param>
-        public TestFrameworkDOTDeserialiser(string source)
-        {
-            this.Source = source;
-        }
-
-        /// <summary>
-        /// The test module source file path
-        /// </summary>
-        public string Source { get; private set; }
-
-        /// <summary>
-        /// Parses the stream containing a Boost Test DOT representation of a Test Framework
-        /// </summary>
-        /// <param name="stream">The stream consisting of a DOT representation</param>
-        /// <returns>The deserialised Test Framework</returns>
-        public TestFramework Deserialise(Stream stream)
-        {
-            return Deserialise(stream, null);
-        }
-
-        /// <summary>
-        /// Parses the stream containing a Boost Test DOT representation of a Test Framework. Notifies the 
-        /// provided visitor (during parsing) of any identified test units.
-        /// </summary>
-        /// <param name="stream">The stream consisting of a DOT representation</param>
-        /// <param name="visitor">The visitor which will be notified during parsing</param>
-        /// <returns>The deserialised Test Framework</returns>
-        /// <remarks>
-        ///     The visitor will not necessarily be notified in a top-down fashion. To ensure top-down
-        ///     visitation, wait for the result and visit the master test suite.
-        /// </remarks>
-        public TestFramework Deserialise(Stream stream, ITestVisitor visitor)
-        {
-            BoostTestFrameworkVisitor dotVisitor = new BoostTestFrameworkVisitor(this, visitor);
-            return DOT.Parse(stream, dotVisitor);
-        }
-
-        /// <summary>
-        /// Implementation of DOTBaseVisitor which creates/populates a
-        /// TestFramework instance from a DOT abstract syntax tree.
-        /// </summary>
-        private class BoostTestFrameworkVisitor : DOTBaseVisitor<TestFramework>
-        {
-            /// <summary>
-            /// Constructor
-            /// </summary>
-            /// <param name="parent">The parent TestFrameworkDOTDeserialiser instance</param>
-            public BoostTestFrameworkVisitor(TestFrameworkDOTDeserialiser parent, ITestVisitor visitor)
-            {
-                this.Parent = parent;
-                this.Visitor = visitor;
-
-                this.Framework = null;
-                this.Context = null;
-            }
-
-            /// <summary>
-            /// The parent TestFrameworkDOTDeserialiser instance
-            /// </summary>
-            public TestFrameworkDOTDeserialiser Parent { get; private set; }
-
-            /// <summary>
-            /// An ITestVisitor which is to be notified once a test unit has been fully defined
-            /// </summary>
-            public ITestVisitor Visitor { get; private set; }
-
-            /// <summary>
-            /// The generated Test Framework
-            /// </summary>
-            public TestFramework Framework { get; private set; }
-
-            /// <summary>
-            /// Context class used to aggregate information during parsing
-            /// </summary>
-            private class DOTContext
-            {
-                /// <summary>
-                /// Default Constructor
-                /// </summary>
-                public DOTContext()
-                {
-                    this.TestUnits = new Stack<TestUnitInfo>();
-                }
-
-                /// <summary>
-                /// The current parent test suite which will host child test cases
-                /// </summary>
-                public TestSuite ParentSuite { get; set; }
-
-                /// <summary>
-                /// The master test suite
-                /// </summary>
-                public TestSuite MasterTestSuite { get; set; }
-
-                /// <summary>
-                /// In-progress test unit information which is currently being parsed
-                /// </summary>
-                public Stack<TestUnitInfo> TestUnits { get; private set; }
-            }
-
-            /// <summary>
-            /// The current deserialisation context
-            /// </summary>
-            private DOTContext Context { get; set; }
-
-            #region DOTBaseVisitor<TestFramework>
-
-            public override TestFramework VisitGraph([NotNull] DOTParser.GraphContext context)
-            {
-                this.Context = new DOTContext();
-                this.Framework = null;
-
-                // Visit children
-                this.Framework = base.VisitGraph(context);
-
-                this.Framework = new TestFramework(this.Parent.Source, this.Context.MasterTestSuite);
-                this.Context = null;
-
-                return this.Framework;
-            }
-
-            public override TestFramework VisitSubgraph([NotNull] DOTParser.SubgraphContext context)
-            {
-                TestUnitInfo info = this.Context.TestUnits.Peek();
-
-                TestSuite suite = CreateTestSuite(info, this.Context.ParentSuite);
-                this.Context.ParentSuite = suite;
-
-                if (this.Context.MasterTestSuite == null)
-                {
-                    this.Context.MasterTestSuite = suite;
-                }
-
-                // Visit Children
-                this.Framework = base.VisitSubgraph(context);
-
-                // Register any child test cases
-                while (info != this.Context.TestUnits.Peek())
-                {
-                    TestCase test = CreateTestCase(this.Context.TestUnits.Pop(), this.Context.ParentSuite);
-                    Visit(test);
-                }
-
-                // NOTE Suite is visited after children since it is at this point that we
-                //      can guarantee that the suite is fully formed
-                Visit(suite);
-
-                this.Context.TestUnits.Pop();
-                this.Context.ParentSuite = (TestSuite)suite.Parent;
-
-                return this.Framework;
-            }
-
-            public override TestFramework VisitNode_stmt([NotNull] DOTParser.Node_stmtContext context)
-            {
-                TestUnitInfo info = new TestUnitInfo(context.node_id().GetText());
-
-                foreach (var attribute in GetKeyValuePairs(context.attr_list()))
-                {
-                    switch (attribute.Key)
-                    {
-                        case "color":
-                            {
-                                // 'green' implies that the test is explicitly enabled by default
-                                // 'yellow' implies that it is enabled, but *may* be disabled
-                                info.DefaultEnabled = (attribute.Value == "green");
-                                break;
-                            }
-
-                        case "label":
-                            {
-                                // Parse BOOST Test specific content
-                                info.Parse(attribute.Value.Trim('"'));
-                                break;
-                            }
-                    }
-                };
-
-                this.Context.TestUnits.Push(info);
-           
-                return base.VisitNode_stmt(context);
-            }
-
-            public override TestFramework VisitEdge_stmt([NotNull] DOTParser.Edge_stmtContext context)
-            {
-                TestUnitInfo info = this.Context.TestUnits.Peek();
-
-                if (info != null)
-                {
-                    var lhs = context.node_id();
-                    var rhs = lhs;
-
-                    var edgeRhs = context.edgeRHS();
-
-                    // NOTE Boost Test DOT output only define one edge per edge statement
-                    if (edgeRhs.edgeop().Length == 1)
-                    {
-                        var edgeop = edgeRhs.edgeop()[0];
-                        // Ensure that a directed edge '->' token is used
-                        if (edgeop.GetToken(DOTLexer.T__7, 0) != null)
-                        {
-                            rhs = edgeRhs.node_id()[0];
-                        }
-                    }
-
-                    if ((lhs != rhs) && (rhs != null))
-                    {
-                        // Identify whether this edge is a constraining edge (i.e. an actual graph edge) or a non-constraining edge
-                        bool constraint = !GetKeyValuePairs(context.attr_list()).Any((attribute) => (attribute.Key == "constraint") && (attribute.Value == "false"));
-                        
-                        // This implies a test dependency
-                        if ((lhs.GetText() == info.id) && !constraint)
-                        {
-                            info.Dependencies.Add(rhs.GetText());
-                        }
-                        // This implies a test unit relationship
-                        else if (rhs.GetText() == info.id)
-                        {
-                            info.Parents.Add(lhs.GetText());
-                        }
-                    }
-                }
-
-                return base.VisitEdge_stmt(context);
-            }
-
-            #endregion DOTBaseVisitor<TestFramework>
-
-            /// <summary>
-            /// Iterates over all key-value pair attributes contained within the provided attr_list
-            /// </summary>
-            /// <param name="attr_list">The attr_list to iterate</param>
-            /// <returns>An enumeration of all key-value pairs present in the provided attr_list</returns>
-            private static IEnumerable<KeyValuePair<string, string>> GetKeyValuePairs(DOTParser.Attr_listContext attr_list)
-            {
-                // NOTE Refer to DOT grammar; an 'attr_list' is composed of an 'a_list', which is composed of multiple 'id's
-
-                if (attr_list != null)
-                {
-                    var a_lists = attr_list.a_list();
-                    if (a_lists != null)
-                    {
-                        for (int i = 0; i < a_lists.Length; ++i)
-                        {
-                            var a_list = a_lists[i];
-
-                            int id = 0;
-                            int idCount = a_list.id().Length;
-
-                            // Try to identify the id() list as a list of 'id' = 'id' tuples
-
-                            while (id < idCount)
-                            {
-                                var lhs = a_list.id()[id];
-
-                                // Reference: Antlr4 C# Runtime [ParserRuleContext.GetTokens(int)]
-                                var sibling = a_list.GetChild(a_list.children.IndexOf(lhs) + 1) as ITerminalNode;
-
-                                // Identify if the a_list contains a key/value pair separated by the '=' token
-                                if ((sibling != null) && (sibling.Symbol.Type == DOTLexer.T__3))
-                                {
-                                    yield return new KeyValuePair<string, string>(lhs.GetText(), a_list.id()[id + 1].GetText());
-                                    id += 2;
-                                }
-                                // Else provide the identifier a single item
-                                else
-                                {
-                                    yield return new KeyValuePair<string, string>(lhs.GetText(), null);
-                                    ++id;
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-
-            /// <summary>
-            /// Creates a TestSuite instance from the provided TestUnitInfo structure
-            /// </summary>
-            /// <param name="info">The currently accumulated test unit information</param>
-            /// <param name="parent">The parent test suite of this test unit</param>
-            /// <returns>A TestSuite based on the provided information</returns>
-            private static TestSuite CreateTestSuite(TestUnitInfo info, TestSuite parent)
-            {
-                return PopulateTestUnit(info, new TestSuite(info.Name, parent));
-            }
-
-            /// <summary>
-            /// Creates a TestCase instance from the provided TestUnitInfo structure
-            /// </summary>
-            /// <param name="info">The currently accumulated test unit information</param>
-            /// <param name="parent">The parent test suite of this test unit</param>
-            /// <returns>A TestCase based on the provided information</returns>
-            private static TestCase CreateTestCase(TestUnitInfo info, TestSuite parent)
-            {
-                return PopulateTestUnit(info, new TestCase(info.Name, parent));
-            }
-
-            /// <summary>
-            /// Populates the provided TestUnit with the test unit information
-            /// </summary>
-            /// <typeparam name="T">A TestUnit derived type</typeparam>
-            /// <param name="info">The currently accumulated test unit information</param>
-            /// <param name="unit">The test unit instance which is to be populated</param>
-            /// <returns>unit</returns>
-            private static T PopulateTestUnit<T>(TestUnitInfo info, T unit) where T : TestUnit
-            {
-                if ((!string.IsNullOrEmpty(info.id)) && (info.id.Length > 2))
-                {
-                    // Remove the 'tu' prefix from the test unit string ID
-
-                    int id = 0;
-                    if (int.TryParse(info.id.Substring(2), NumberStyles.Integer, CultureInfo.InvariantCulture, out id))
-                    {
-                        unit.Id = id;
-                    }
-                }
-
-                unit.Source = info.SourceInfo;
-                unit.Labels = info.Labels;
-
-                unit.DefaultEnabled = info.DefaultEnabled;   
-
-                // Default Enabled
-                // Timeout
-                // Expected Failures
-                // Dependencies
-
-                return unit;
-            }
-
-            /// <summary>
-            /// Allows the registered ITestVisitor to visit the completed TestUnit definition
-            /// </summary>
-            /// <param name="unit">The test unit to visit</param>
-            void Visit(TestUnit unit)
-            {
-                if (this.Visitor != null)
-                {
-                    unit.Apply(this.Visitor);
-                }
-            }
-
-            /// <summary>
-            /// Aggregation of test unit information contained within a Boost Test DOT serialisation
-            /// </summary>
-            private class TestUnitInfo
-            {
-                /// <summary>
-                /// Constructor
-                /// </summary>
-                /// <param name="id">Test Unit ID (e.g. tu1)</param>
-                public TestUnitInfo(string id)
-                {
-                    this.id = id;
-
-                    this.Name = string.Empty;
-                    this.SourceInfo = null;
-                    this.Timeout = 0;
-                    this.ExpectedFailures = 0;
-                    this.Labels = Enumerable.Empty<string>();
-                    
-                    this.Parents = new List<string>();
-                    this.Dependencies = new List<string>();
-
-                    this.DefaultEnabled = true;
-                }
-
-                /// <summary>
-                /// Test Unit ID (e.g. tu1)
-                /// </summary>
-                public string id { get; private set; }
-
-                /// <summary>
-                /// Test Unit Name
-                /// </summary>
-                public string Name { get; set; }
-
-                /// <summary>
-                /// Source information
-                /// </summary>
-                public SourceFileInfo SourceInfo { get; set; }
-
-                /// <summary>
-                /// Test timeout
-                /// </summary>
-                public uint Timeout { get; set; }
-
-                /// <summary>
-                /// Test expected failure count
-                /// </summary>
-                public uint ExpectedFailures { get; set; }
-
-                /// <summary>
-                /// Test labels
-                /// </summary>
-                public IEnumerable<string> Labels { get; set; }
-
-                /// <summary>
-                /// Test unit children
-                /// </summary>
-                public List<string> Parents { get; set; }
-
-                /// <summary>
-                /// Test unit dependencies
-                /// </summary>
-                public List<string> Dependencies { get; set; }
-
-                /// <summary>
-                /// Flag which is raised when the test is explicitly set to true
-                /// </summary>
-                public bool DefaultEnabled { get; set; }
-
-                /// <summary>
-                /// Parses test unit information from the provided string
-                /// </summary>
-                /// <param name="value">The string to parse</param>
-                /// <returns>Test unit information contained within value</returns>
-                /// <exception cref="FormatException"></exception>
-                public TestUnitInfo Parse(string value)
-                {
-                    TestUnitInfo info = new TestUnitInfo(this.id);
-                    info.DefaultEnabled = this.DefaultEnabled;
-                    string[] properties = value.Split('|');
-
-                    if (properties.Length > 0)
-                    {
-                        info.Name = properties[0];
-                    }
-                    if (properties.Length > 1)
-                    {
-                        info.SourceInfo = SourceFileInfo.Parse(properties[1]);
-                    }
-                    if (properties.Length > 2)
-                    {
-                        foreach (var attribute in ParseKeyValuePairs(properties.Skip(2)))
-                        {
-                            ParseNamedAttribute(info, attribute);
-                        }
-                    }
-
-                    // Replace the contents of 'this' with that of 'info'
-                    Set(info);
-
-                    return this;
-                }
-
-                /// <summary>
-                /// Sets the current instance properties to the one provided
-                /// </summary>
-                /// <param name="value"></param>
-                private void Set(TestUnitInfo value)
-                {
-                    this.id = value.id;
-                    this.Name = value.Name;
-                    this.SourceInfo = value.SourceInfo;
-                    this.DefaultEnabled = value.DefaultEnabled;
-                    this.Timeout = value.Timeout;
-                    this.ExpectedFailures = value.ExpectedFailures;
-                    this.Labels = value.Labels;
-                    this.Parents = value.Parents;
-                    this.Dependencies = value.Dependencies;
-                }
-
-                /// <summary>
-                /// Parses a Boost Test DOT named attribute label
-                /// </summary>
-                /// <param name="info">The test unit information structure which to populate</param>
-                /// <param name="attribute">The attribute to parse</param>
-                private static void ParseNamedAttribute(TestUnitInfo info, KeyValuePair<string, string> attribute)
-                {
-                    switch (attribute.Key)
-                    {
-                        case "timeout":
-                            {
-                                info.Timeout = uint.Parse(attribute.Value, CultureInfo.InvariantCulture);
-                                break;
-                            }
-                        case "expected failures":
-                            {
-                                info.ExpectedFailures = uint.Parse(attribute.Value, CultureInfo.InvariantCulture);
-                                break;
-                            }
-                        case "labels":
-                            {
-                                var labels = attribute.Value.Split(new[] { " @" }, StringSplitOptions.RemoveEmptyEntries);
-                                if (labels.Length > 0)
-                                {
-                                    info.Labels = labels;
-                                }
-                                break;
-                            }
-                    }
-                }
-
-                /// <summary>
-                /// Parses the Boost Test DOT label attributes for any key-value pairs
-                /// </summary>
-                /// <param name="values">The values/attributes to parse</param>
-                /// <returns>An enumeration of successfully parsed key-value pairs</param>
-                private static IEnumerable<KeyValuePair<string, string>> ParseKeyValuePairs(IEnumerable<string> values)
-                {
-                    foreach (string value in values)
-                    {
-                        // NOTE 'timeout' and 'expected failures' use '=' as a separator, 'labels' use ':'
-                        string[] keyValue = value.Split(new[] { '=', ':' }, 2, StringSplitOptions.RemoveEmptyEntries);
-                        if (keyValue.Length == 2)
-                        {
-                            yield return new KeyValuePair<string, string>(keyValue[0], keyValue[1]);
-                        }
-                    }
-                }
-            }
-        }
-    }
+// (C) Copyright ETAS 2015.
+// 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)
+
+using System;
+using System.IO;
+using System.Linq;
+using System.Globalization;
+using System.Collections.Generic;
+
+using Antlr.DOT;
+using Antlr4.Runtime.Tree;
+using Antlr4.Runtime.Misc;
+
+using BoostTestAdapter.Utility;
+
+namespace BoostTestAdapter.Boost.Test
+{
+    /// <summary>
+    /// A Test Framework deserialiser which generates a 
+    /// Test Framework instance from a Boost Test DOT representation.
+    /// </summary>
+    public class TestFrameworkDOTDeserialiser
+    {
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="source">The test module source file path</param>
+        public TestFrameworkDOTDeserialiser(string source)
+        {
+            this.Source = source;
+        }
+
+        /// <summary>
+        /// The test module source file path
+        /// </summary>
+        public string Source { get; private set; }
+
+        /// <summary>
+        /// Parses the stream containing a Boost Test DOT representation of a Test Framework
+        /// </summary>
+        /// <param name="stream">The stream consisting of a DOT representation</param>
+        /// <returns>The deserialised Test Framework</returns>
+        public TestFramework Deserialise(Stream stream)
+        {
+            BoostTestFrameworkVisitor dotVisitor = new BoostTestFrameworkVisitor(this);
+            return DOT.Parse(stream, dotVisitor);
+        }
+        
+        /// <summary>
+        /// Implementation of DOTBaseVisitor which creates/populates a
+        /// TestFramework instance from a DOT abstract syntax tree.
+        /// </summary>
+        private class BoostTestFrameworkVisitor : DOTBaseVisitor<TestFramework>
+        {
+            /// <summary>
+            /// Constructor
+            /// </summary>
+            /// <param name="parent">The parent TestFrameworkDOTDeserialiser instance</param>
+            public BoostTestFrameworkVisitor(TestFrameworkDOTDeserialiser parent)
+            {
+                this.Parent = parent;
+
+                this.Framework = null;
+                this.Context = null;
+            }
+
+            /// <summary>
+            /// The parent TestFrameworkDOTDeserialiser instance
+            /// </summary>
+            public TestFrameworkDOTDeserialiser Parent { get; private set; }
+            
+            /// <summary>
+            /// The generated Test Framework
+            /// </summary>
+            public TestFramework Framework { get; private set; }
+
+            /// <summary>
+            /// Context class used to aggregate information during parsing
+            /// </summary>
+            private class DOTContext
+            {
+                /// <summary>
+                /// Default Constructor
+                /// </summary>
+                public DOTContext()
+                {
+                    this.TestUnits = new Stack<TestUnitInfo>();
+                }
+
+                /// <summary>
+                /// The current parent test suite which will host child test cases
+                /// </summary>
+                public TestSuite ParentSuite { get; set; }
+
+                /// <summary>
+                /// The master test suite
+                /// </summary>
+                public TestSuite MasterTestSuite { get; set; }
+
+                /// <summary>
+                /// In-progress test unit information which is currently being parsed
+                /// </summary>
+                public Stack<TestUnitInfo> TestUnits { get; private set; }
+            }
+
+            /// <summary>
+            /// The current deserialisation context
+            /// </summary>
+            private DOTContext Context { get; set; }
+
+            #region DOTBaseVisitor<TestFramework>
+
+            public override TestFramework VisitGraph([NotNull] DOTParser.GraphContext context)
+            {
+                this.Context = new DOTContext();
+                this.Framework = null;
+
+                // Visit children
+                this.Framework = base.VisitGraph(context);
+
+                this.Framework = new TestFramework(this.Parent.Source, this.Context.MasterTestSuite);
+                this.Context = null;
+
+                return this.Framework;
+            }
+
+            public override TestFramework VisitSubgraph([NotNull] DOTParser.SubgraphContext context)
+            {
+                TestUnitInfo info = this.Context.TestUnits.Peek();
+
+                TestSuite suite = CreateTestSuite(info, this.Context.ParentSuite);
+                this.Context.ParentSuite = suite;
+
+                if (this.Context.MasterTestSuite == null)
+                {
+                    this.Context.MasterTestSuite = suite;
+                }
+
+                // Visit Children
+                this.Framework = base.VisitSubgraph(context);
+
+                // Register any child test cases
+                while (info != this.Context.TestUnits.Peek())
+                {
+                    CreateTestCase(this.Context.TestUnits.Pop(), this.Context.ParentSuite);
+                }
+                
+                this.Context.TestUnits.Pop();
+                this.Context.ParentSuite = (TestSuite)suite.Parent;
+
+                return this.Framework;
+            }
+
+            public override TestFramework VisitNode_stmt([NotNull] DOTParser.Node_stmtContext context)
+            {
+                TestUnitInfo info = new TestUnitInfo(context.node_id().GetText());
+
+                foreach (var attribute in GetKeyValuePairs(context.attr_list()))
+                {
+                    switch (attribute.Key)
+                    {
+                        case "color":
+                            {
+                                // 'green' implies that the test is explicitly enabled by default
+                                // 'yellow' implies that it is enabled, but *may* be disabled
+                                info.DefaultEnabled = (attribute.Value == "green");
+                                break;
+                            }
+
+                        case "label":
+                            {
+                                // Parse BOOST Test specific content
+                                info.Parse(attribute.Value.Trim('"'));
+                                break;
+                            }
+                    }
+                };
+
+                this.Context.TestUnits.Push(info);
+           
+                return base.VisitNode_stmt(context);
+            }
+
+            public override TestFramework VisitEdge_stmt([NotNull] DOTParser.Edge_stmtContext context)
+            {
+                TestUnitInfo info = this.Context.TestUnits.Peek();
+
+                if (info != null)
+                {
+                    var lhs = context.node_id();
+                    var rhs = lhs;
+
+                    var edgeRhs = context.edgeRHS();
+
+                    // NOTE Boost Test DOT output only define one edge per edge statement
+                    if (edgeRhs.edgeop().Length == 1)
+                    {
+                        var edgeop = edgeRhs.edgeop()[0];
+                        // Ensure that a directed edge '->' token is used
+                        if (edgeop.GetToken(DOTLexer.T__7, 0) != null)
+                        {
+                            rhs = edgeRhs.node_id()[0];
+                        }
+                    }
+
+                    if ((lhs != rhs) && (rhs != null))
+                    {
+                        // Identify whether this edge is a constraining edge (i.e. an actual graph edge) or a non-constraining edge
+                        bool constraint = !GetKeyValuePairs(context.attr_list()).Any((attribute) => (attribute.Key == "constraint") && (attribute.Value == "false"));
+                        
+                        // This implies a test dependency
+                        if ((lhs.GetText() == info.id) && !constraint)
+                        {
+                            info.Dependencies.Add(rhs.GetText());
+                        }
+                        // This implies a test unit relationship
+                        else if (rhs.GetText() == info.id)
+                        {
+                            info.Parents.Add(lhs.GetText());
+                        }
+                    }
+                }
+
+                return base.VisitEdge_stmt(context);
+            }
+
+            #endregion DOTBaseVisitor<TestFramework>
+
+            /// <summary>
+            /// Iterates over all key-value pair attributes contained within the provided attr_list
+            /// </summary>
+            /// <param name="attr_list">The attr_list to iterate</param>
+            /// <returns>An enumeration of all key-value pairs present in the provided attr_list</returns>
+            private static IEnumerable<KeyValuePair<string, string>> GetKeyValuePairs(DOTParser.Attr_listContext attr_list)
+            {
+                // NOTE Refer to DOT grammar; an 'attr_list' is composed of an 'a_list', which is composed of multiple 'id's
+
+                if (attr_list != null)
+                {
+                    var a_lists = attr_list.a_list();
+                    if (a_lists != null)
+                    {
+                        for (int i = 0; i < a_lists.Length; ++i)
+                        {
+                            var a_list = a_lists[i];
+
+                            int id = 0;
+                            int idCount = a_list.id().Length;
+
+                            // Try to identify the id() list as a list of 'id' = 'id' tuples
+
+                            while (id < idCount)
+                            {
+                                var lhs = a_list.id()[id];
+
+                                // Reference: Antlr4 C# Runtime [ParserRuleContext.GetTokens(int)]
+                                var sibling = a_list.GetChild(a_list.children.IndexOf(lhs) + 1) as ITerminalNode;
+
+                                // Identify if the a_list contains a key/value pair separated by the '=' token
+                                if ((sibling != null) && (sibling.Symbol.Type == DOTLexer.T__3))
+                                {
+                                    yield return new KeyValuePair<string, string>(lhs.GetText(), a_list.id()[id + 1].GetText());
+                                    id += 2;
+                                }
+                                // Else provide the identifier a single item
+                                else
+                                {
+                                    yield return new KeyValuePair<string, string>(lhs.GetText(), null);
+                                    ++id;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
+            /// <summary>
+            /// Creates a TestSuite instance from the provided TestUnitInfo structure
+            /// </summary>
+            /// <param name="info">The currently accumulated test unit information</param>
+            /// <param name="parent">The parent test suite of this test unit</param>
+            /// <returns>A TestSuite based on the provided information</returns>
+            private static TestSuite CreateTestSuite(TestUnitInfo info, TestSuite parent)
+            {
+                return PopulateTestUnit(info, new TestSuite(info.Name, parent));
+            }
+
+            /// <summary>
+            /// Creates a TestCase instance from the provided TestUnitInfo structure
+            /// </summary>
+            /// <param name="info">The currently accumulated test unit information</param>
+            /// <param name="parent">The parent test suite of this test unit</param>
+            /// <returns>A TestCase based on the provided information</returns>
+            private static TestCase CreateTestCase(TestUnitInfo info, TestSuite parent)
+            {
+                return PopulateTestUnit(info, new TestCase(info.Name, parent));
+            }
+
+            /// <summary>
+            /// Populates the provided TestUnit with the test unit information
+            /// </summary>
+            /// <typeparam name="T">A TestUnit derived type</typeparam>
+            /// <param name="info">The currently accumulated test unit information</param>
+            /// <param name="unit">The test unit instance which is to be populated</param>
+            /// <returns>unit</returns>
+            private static T PopulateTestUnit<T>(TestUnitInfo info, T unit) where T : TestUnit
+            {
+                if ((!string.IsNullOrEmpty(info.id)) && (info.id.Length > 2))
+                {
+                    // Remove the 'tu' prefix from the test unit string ID
+
+                    int id = 0;
+                    if (int.TryParse(info.id.Substring(2), NumberStyles.Integer, CultureInfo.InvariantCulture, out id))
+                    {
+                        unit.Id = id;
+                    }
+                }
+
+                unit.Source = info.SourceInfo;
+                unit.Labels = info.Labels;
+
+                unit.DefaultEnabled = info.DefaultEnabled;   
+
+                // Default Enabled
+                // Timeout
+                // Expected Failures
+                // Dependencies
+
+                return unit;
+            }
+
+            /// <summary>
+            /// Aggregation of test unit information contained within a Boost Test DOT serialisation
+            /// </summary>
+            private class TestUnitInfo
+            {
+                /// <summary>
+                /// Constructor
+                /// </summary>
+                /// <param name="id">Test Unit ID (e.g. tu1)</param>
+                public TestUnitInfo(string id)
+                {
+                    this.id = id;
+
+                    this.Name = string.Empty;
+                    this.SourceInfo = null;
+                    this.Timeout = 0;
+                    this.ExpectedFailures = 0;
+                    this.Labels = Enumerable.Empty<string>();
+                    
+                    this.Parents = new List<string>();
+                    this.Dependencies = new List<string>();
+
+                    this.DefaultEnabled = true;
+                }
+
+                /// <summary>
+                /// Test Unit ID (e.g. tu1)
+                /// </summary>
+                public string id { get; private set; }
+
+                /// <summary>
+                /// Test Unit Name
+                /// </summary>
+                public string Name { get; set; }
+
+                /// <summary>
+                /// Source information
+                /// </summary>
+                public SourceFileInfo SourceInfo { get; set; }
+
+                /// <summary>
+                /// Test timeout
+                /// </summary>
+                public uint Timeout { get; set; }
+
+                /// <summary>
+                /// Test expected failure count
+                /// </summary>
+                public uint ExpectedFailures { get; set; }
+
+                /// <summary>
+                /// Test labels
+                /// </summary>
+                public IEnumerable<string> Labels { get; set; }
+
+                /// <summary>
+                /// Test unit children
+                /// </summary>
+                public List<string> Parents { get; set; }
+
+                /// <summary>
+                /// Test unit dependencies
+                /// </summary>
+                public List<string> Dependencies { get; set; }
+
+                /// <summary>
+                /// Flag which is raised when the test is explicitly set to true
+                /// </summary>
+                public bool DefaultEnabled { get; set; }
+
+                /// <summary>
+                /// Parses test unit information from the provided string
+                /// </summary>
+                /// <param name="value">The string to parse</param>
+                /// <returns>Test unit information contained within value</returns>
+                /// <exception cref="FormatException"></exception>
+                public TestUnitInfo Parse(string value)
+                {
+                    TestUnitInfo info = new TestUnitInfo(this.id);
+                    info.DefaultEnabled = this.DefaultEnabled;
+                    string[] properties = value.Split('|');
+
+                    if (properties.Length > 0)
+                    {
+                        info.Name = properties[0];
+                    }
+                    if (properties.Length > 1)
+                    {
+                        info.SourceInfo = SourceFileInfo.Parse(properties[1]);
+                    }
+                    if (properties.Length > 2)
+                    {
+                        foreach (var attribute in ParseKeyValuePairs(properties.Skip(2)))
+                        {
+                            ParseNamedAttribute(info, attribute);
+                        }
+                    }
+
+                    // Replace the contents of 'this' with that of 'info'
+                    Set(info);
+
+                    return this;
+                }
+
+                /// <summary>
+                /// Sets the current instance properties to the one provided
+                /// </summary>
+                /// <param name="value"></param>
+                private void Set(TestUnitInfo value)
+                {
+                    this.id = value.id;
+                    this.Name = value.Name;
+                    this.SourceInfo = value.SourceInfo;
+                    this.DefaultEnabled = value.DefaultEnabled;
+                    this.Timeout = value.Timeout;
+                    this.ExpectedFailures = value.ExpectedFailures;
+                    this.Labels = value.Labels;
+                    this.Parents = value.Parents;
+                    this.Dependencies = value.Dependencies;
+                }
+
+                /// <summary>
+                /// Parses a Boost Test DOT named attribute label
+                /// </summary>
+                /// <param name="info">The test unit information structure which to populate</param>
+                /// <param name="attribute">The attribute to parse</param>
+                private static void ParseNamedAttribute(TestUnitInfo info, KeyValuePair<string, string> attribute)
+                {
+                    switch (attribute.Key)
+                    {
+                        case "timeout":
+                            {
+                                info.Timeout = uint.Parse(attribute.Value, CultureInfo.InvariantCulture);
+                                break;
+                            }
+                        case "expected failures":
+                            {
+                                info.ExpectedFailures = uint.Parse(attribute.Value, CultureInfo.InvariantCulture);
+                                break;
+                            }
+                        case "labels":
+                            {
+                                var labels = attribute.Value.Split(new[] { " @" }, StringSplitOptions.RemoveEmptyEntries);
+                                if (labels.Length > 0)
+                                {
+                                    info.Labels = labels;
+                                }
+                                break;
+                            }
+                    }
+                }
+
+                /// <summary>
+                /// Parses the Boost Test DOT label attributes for any key-value pairs
+                /// </summary>
+                /// <param name="values">The values/attributes to parse</param>
+                /// <returns>An enumeration of successfully parsed key-value pairs</param>
+                private static IEnumerable<KeyValuePair<string, string>> ParseKeyValuePairs(IEnumerable<string> values)
+                {
+                    foreach (string value in values)
+                    {
+                        // NOTE 'timeout' and 'expected failures' use '=' as a separator, 'labels' use ':'
+                        string[] keyValue = value.Split(new[] { '=', ':' }, 2, StringSplitOptions.RemoveEmptyEntries);
+                        if (keyValue.Length == 2)
+                        {
+                            yield return new KeyValuePair<string, string>(keyValue[0], keyValue[1]);
+                        }
+                    }
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BoostTestAdapter/Boost/Test/TestUnit.cs b/BoostTestAdapter/Boost/Test/TestUnit.cs
index b09927f..6194773 100644
--- a/BoostTestAdapter/Boost/Test/TestUnit.cs
+++ b/BoostTestAdapter/Boost/Test/TestUnit.cs
@@ -1,192 +1,189 @@
-// (C) Copyright ETAS 2015.
-// 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)
-
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Xml;
-using BoostTestAdapter.Utility;
-
-namespace BoostTestAdapter.Boost.Test
-{
-    /// <summary>
-    /// Base class for Boost Test test components. Follows the composite design pattern.
-    /// </summary>
-    public abstract class TestUnit : ITestVisitable
-    {
-        #region Constructors
-
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        /// <param name="name">Test Unit (local) name.</param>
-        /// <param name="parent">Parent/Owner Test Unit of this instance.</param>
-        protected TestUnit(string name, TestUnit parent)
-        {
-            this.Id = null;
-            this.Name = name;
-            this.Parent = parent;
-            this.Labels = Enumerable.Empty<string>();
-
-            this.DefaultEnabled = true;
-
-            if (parent != null)
-            {
-                parent.AddChild(this);
-            }
-        }
-
-        #endregion Constructors
-
-        #region Properties
-
-        /// <summary>
-        /// Test Unit Id. Optional.
-        /// </summary>
-        public int? Id { get; set; }
-
-        /// <summary>
-        /// Test Unit (local) Name.
-        /// </summary>
-        public string Name { get; private set; }
-
-        /// <summary>
-        /// Parent/Owner Test Unit of this instance.
-        /// </summary>
-        public TestUnit Parent { get; private set; }
-
-        /// <summary>
-        /// Child Test Units of this instance.
-        /// </summary>
-        public virtual IEnumerable<TestUnit> Children
-        {
-            get
-            {
-                return Enumerable.Empty<TestUnit>();
-            }
-        }
-
-        /// <summary>
-        /// Optional source file information related to this test unit.
-        /// </summary>
-        public SourceFileInfo Source { get; set; }
-
-        /// <summary>
-        /// Identifies any label associations with this test unit
-        /// </summary>
-        public IEnumerable<string> Labels { get; set; }
-
-
-
-        /// <summary>
-        /// Cached version of the fully qualified name builder
-        /// </summary>
-        private QualifiedNameBuilder _fullyQualifiedName = null;
-
-        /// <summary>
-        /// Internal property which provides a cached QualifiedNameBuilder to represent the fully qualified name
-        /// </summary>
-        private QualifiedNameBuilder FullyQualifiedNameBuilder
-        {
-            get
-            {
-                if (this._fullyQualifiedName == null)
-                {
-                    _fullyQualifiedName = (Parent == null) ? new QualifiedNameBuilder() : Parent.FullyQualifiedNameBuilder.Clone();
-                    _fullyQualifiedName.Push(this);
-                }
-
-                return _fullyQualifiedName;
-            }
-        }
-        
-        /// <summary>
-        /// Identifies the fully qualified name of this TestUnit
-        /// </summary>
-        public string FullyQualifiedName
-        {
-            get
-            {
-                return FullyQualifiedNameBuilder.ToString();
-            }
-        }
-
-        /// <summary>
-        ///  Identifies whether the test is explicitly disabled by setting this value to false
-        /// </summary>
-
-        public bool DefaultEnabled { get; set; }
-
-        #endregion Properties
-
-        /// <summary>
-        /// Adds a child to this TestUnit
-        /// </summary>
-        /// <param name="unit">The unit to add as a child</param>
-        public virtual void AddChild(TestUnit unit)
-        {
-            throw new InvalidOperationException();
-        }
-        
-        #region ITestVisitable
-
-        public abstract void Apply(ITestVisitor visitor);
-
-        #endregion ITestVisitable
-
-        #region Utility
-
-        /// <summary>
-        /// Given a fully qualified name of a <b>test case</b>, generates the respective test unit hierarchy.
-        /// </summary>
-        /// <param name="fullyQualifiedName">The fully qualified name of the <b>test case</b></param>
-        /// <returns>The test case hierarcy represented by the provided fully qualified name</returns>
-        public static TestCase FromFullyQualifiedName(string fullyQualifiedName)
-        {
-            return FromFullyQualifiedName(QualifiedNameBuilder.FromString(fullyQualifiedName));
-        }
-        
-        /// <summary>
-        /// Given a fully qualified name of a <b>test case</b>, generates the respective test unit hierarchy.
-        /// </summary>
-        /// <param name="fullyQualifiedName">The fully qualified name of the <b>test case</b></param>
-        /// <returns>The test case hierarchy represented by the provided fully qualified name</returns>
-        /// <remarks>The parameter 'fullyQualifiedName' will be modified and emptied in due process</remarks>
-        private static TestCase FromFullyQualifiedName(QualifiedNameBuilder fullyQualifiedName)
-        {
-            // Reverse the fully qualified name stack i.e. Master Test Suite should be first element and Test Case should be last element
-            Stack<string> hierarchy = new Stack<string>();
-            while (fullyQualifiedName.Peek() != null)
-            {
-                hierarchy.Push(fullyQualifiedName.Peek());
-                fullyQualifiedName.Pop();
-            }
-
-            TestSuite parent = null;
-
-            // Treat each entry (except for the last) as a test suite
-            while (hierarchy.Count > 1)
-            {
-                parent = new TestSuite(hierarchy.Peek(), parent);
-                hierarchy.Pop();
-            }
-
-            // Treat the last entry as a test case
-            return (hierarchy.Count == 1) ? new TestCase(hierarchy.Peek(), parent) : null;
-        }
-
-        #endregion Utility
-
-        #region object overrides
-
-        public override string ToString()
-        {
-            return this.FullyQualifiedName;
-        }
-
-        #endregion object overrides
-    }
+// (C) Copyright ETAS 2015.
+// 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)
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Xml;
+using BoostTestAdapter.Utility;
+
+namespace BoostTestAdapter.Boost.Test
+{
+    /// <summary>
+    /// Base class for Boost Test test components. Follows the composite design pattern.
+    /// </summary>
+    public abstract class TestUnit : ITestVisitable
+    {
+        #region Constructors
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="name">Test Unit (local) name.</param>
+        /// <param name="parent">Parent/Owner Test Unit of this instance.</param>
+        protected TestUnit(string name, TestUnit parent)
+        {
+            this.Id = null;
+            this.Name = name;
+            this.Parent = parent;
+            this.Labels = Enumerable.Empty<string>();
+
+            this.DefaultEnabled = true;
+
+            if (parent != null)
+            {
+                parent.AddChild(this);
+            }
+        }
+
+        #endregion Constructors
+
+        #region Properties
+
+        /// <summary>
+        /// Test Unit Id. Optional.
+        /// </summary>
+        public int? Id { get; set; }
+
+        /// <summary>
+        /// Test Unit (local) Name.
+        /// </summary>
+        public string Name { get; private set; }
+
+        /// <summary>
+        /// Parent/Owner Test Unit of this instance.
+        /// </summary>
+        public TestUnit Parent { get; private set; }
+
+        /// <summary>
+        /// Child Test Units of this instance.
+        /// </summary>
+        public virtual IEnumerable<TestUnit> Children
+        {
+            get
+            {
+                return Enumerable.Empty<TestUnit>();
+            }
+        }
+
+        /// <summary>
+        /// Optional source file information related to this test unit.
+        /// </summary>
+        public SourceFileInfo Source { get; set; }
+
+        /// <summary>
+        /// Identifies any label associations with this test unit
+        /// </summary>
+        public IEnumerable<string> Labels { get; set; }
+        
+        /// <summary>
+        /// Cached version of the fully qualified name builder
+        /// </summary>
+        private QualifiedNameBuilder _fullyQualifiedName = null;
+
+        /// <summary>
+        /// Internal property which provides a cached QualifiedNameBuilder to represent the fully qualified name
+        /// </summary>
+        private QualifiedNameBuilder FullyQualifiedNameBuilder
+        {
+            get
+            {
+                if (this._fullyQualifiedName == null)
+                {
+                    _fullyQualifiedName = (Parent == null) ? new QualifiedNameBuilder() : Parent.FullyQualifiedNameBuilder.Clone();
+                    _fullyQualifiedName.Push(this);
+                }
+
+                return _fullyQualifiedName;
+            }
+        }
+        
+        /// <summary>
+        /// Identifies the fully qualified name of this TestUnit
+        /// </summary>
+        public string FullyQualifiedName
+        {
+            get
+            {
+                return FullyQualifiedNameBuilder.ToString();
+            }
+        }
+
+        /// <summary>
+        ///  Identifies whether the test is explicitly disabled by setting this value to false
+        /// </summary>
+        public bool DefaultEnabled { get; set; }
+
+        #endregion Properties
+
+        /// <summary>
+        /// Adds a child to this TestUnit
+        /// </summary>
+        /// <param name="unit">The unit to add as a child</param>
+        public virtual void AddChild(TestUnit unit)
+        {
+            throw new InvalidOperationException();
+        }
+        
+        #region ITestVisitable
+
+        public abstract void Apply(ITestVisitor visitor);
+
+        #endregion ITestVisitable
+
+        #region Utility
+
+        /// <summary>
+        /// Given a fully qualified name of a <b>test case</b>, generates the respective test unit hierarchy.
+        /// </summary>
+        /// <param name="fullyQualifiedName">The fully qualified name of the <b>test case</b></param>
+        /// <returns>The test case hierarcy represented by the provided fully qualified name</returns>
+        public static TestCase FromFullyQualifiedName(string fullyQualifiedName)
+        {
+            return FromFullyQualifiedName(QualifiedNameBuilder.FromString(fullyQualifiedName));
+        }
+        
+        /// <summary>
+        /// Given a fully qualified name of a <b>test case</b>, generates the respective test unit hierarchy.
+        /// </summary>
+        /// <param name="fullyQualifiedName">The fully qualified name of the <b>test case</b></param>
+        /// <returns>The test case hierarchy represented by the provided fully qualified name</returns>
+        /// <remarks>The parameter 'fullyQualifiedName' will be modified and emptied in due process</remarks>
+        private static TestCase FromFullyQualifiedName(QualifiedNameBuilder fullyQualifiedName)
+        {
+            // Reverse the fully qualified name stack i.e. Master Test Suite should be first element and Test Case should be last element
+            Stack<string> hierarchy = new Stack<string>();
+            while (fullyQualifiedName.Peek() != null)
+            {
+                hierarchy.Push(fullyQualifiedName.Peek());
+                fullyQualifiedName.Pop();
+            }
+
+            TestSuite parent = null;
+
+            // Treat each entry (except for the last) as a test suite
+            while (hierarchy.Count > 1)
+            {
+                parent = new TestSuite(hierarchy.Peek(), parent);
+                hierarchy.Pop();
+            }
+
+            // Treat the last entry as a test case
+            return (hierarchy.Count == 1) ? new TestCase(hierarchy.Peek(), parent) : null;
+        }
+
+        #endregion Utility
+
+        #region object overrides
+
+        public override string ToString()
+        {
+            return this.FullyQualifiedName;
+        }
+
+        #endregion object overrides
+    }
 }
\ No newline at end of file
diff --git a/BoostTestAdapter/BoostTestAdapter.csproj b/BoostTestAdapter/BoostTestAdapter.csproj
index f2ac959..c003063 100644
--- a/BoostTestAdapter/BoostTestAdapter.csproj
+++ b/BoostTestAdapter/BoostTestAdapter.csproj
@@ -125,6 +125,7 @@
     <Compile Include="GlobalSuppressions.cs" />
     <Compile Include="Discoverers\IBoostTestDiscoverer.cs" />
     <Compile Include="Discoverers\IBoostTestDiscovererFactory.cs" />
+    <Compile Include="Utility\BoostDataTestCaseVerifier.cs" />
     <Compile Include="Utility\BoostTestRunnerCommandLineArgsEx.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Settings\BoostTestAdapterSettings.cs" />
@@ -152,7 +153,7 @@
     <Compile Include="Utility\TemporaryFile.cs" />
     <Compile Include="Utility\TestPathGenerator.cs" />
     <Compile Include="Utility\TestRun.cs" />
-    <Compile Include="Utility\VisualStudio\DefaultDiscoverySink.cs" />
+    <Compile Include="Utility\VisualStudio\DefaultTestCaseDiscoverySink.cs" />
     <Compile Include="Utility\VisualStudio\DefaultVisualStudioInstanceProvider.cs" />
     <Compile Include="Utility\VisualStudio\IVisualStudioInstanceProvider.cs" />
     <Compile Include="Utility\VisualStudio\VSTestModel.cs" />
diff --git a/BoostTestAdapter/BoostTestDiscoverer.cs b/BoostTestAdapter/BoostTestDiscoverer.cs
index 52c71c9..e34e56a 100644
--- a/BoostTestAdapter/BoostTestDiscoverer.cs
+++ b/BoostTestAdapter/BoostTestDiscoverer.cs
@@ -1,129 +1,129 @@
-// (C) Copyright ETAS 2015.
-// 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)
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using BoostTestAdapter.Settings;
-using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
-using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-using BoostTestAdapter.Utility;
-
-namespace BoostTestAdapter
-{
-    [FileExtension(DllExtension)]
-    [FileExtension(ExeExtension)]
-    [DefaultExecutorUri(BoostTestExecutor.ExecutorUriString)]
-    public class BoostTestDiscoverer : ITestDiscoverer
-    {
-        #region Constants
-
-        public const string DllExtension = ".dll";
-        public const string ExeExtension = ".exe";
-
-        #endregion Constants
-
-        #region Constructors
-
-        /// <summary>
-        /// Default constructor. The default IBoostTestDiscovererFactory implementation is provided.
-        /// </summary>
-        public BoostTestDiscoverer()
-            :this(new BoostTestDiscovererFactory())
-        {
-        }
-
-        /// <summary>
-        /// Constructor.
-        /// </summary>
-        /// <param name="boostTestDiscovererFactory">A custom IBoostTestDiscovererFactory implementation.</param>
-        public BoostTestDiscoverer(IBoostTestDiscovererFactory boostTestDiscovererFactory)
-        {
-            _boostTestDiscovererFactory = boostTestDiscovererFactory;
-        }
-
-        #endregion
-
-
-        #region Members
-
-        private readonly IBoostTestDiscovererFactory _boostTestDiscovererFactory;
-
-        #endregion
-
-
-        #region ITestDiscoverer
-
-        /// <summary>
-        /// Method called by Visual Studio (discovered via reflection) for test enumeration
-        /// </summary>
-        /// <param name="sources">path, target name and target extensions to discover</param>
-        /// <param name="discoveryContext">discovery context settings</param>
-        /// <param name="logger"></param>
-        /// <param name="discoverySink">Unit test framework Sink</param>
-        /// <remarks>Entry point of the discovery procedure</remarks>
-        public void DiscoverTests(IEnumerable<string> sources, IDiscoveryContext discoveryContext, IMessageLogger logger, ITestCaseDiscoverySink discoverySink)
-        {
-#if DEBUG && LAUNCH_DEBUGGER
-            System.Diagnostics.Debugger.Launch();
-#endif
-
-            if (sources == null)
-                return;
-
-            Logger.Initialize(logger);
-
-            DiscoverTests(sources, discoveryContext, discoverySink);
-
-            Logger.Shutdown();
-        }
-
-        #endregion ITestDiscoverer
-
-        /// <summary>
-        /// Method called by BoostTestExecutor for test enumeration
-        /// </summary>
-        /// <param name="sources">path, target name and target extensions to discover</param>
-        /// <param name="discoveryContext">discovery context settings</param>
-        /// <param name="discoverySink">Unit test framework Sink</param>
-        /// <remarks>This method assumes that the Logger singleton is maintained by the caller.</remarks>
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes")]
-        public void DiscoverTests(IEnumerable<string> sources, IDiscoveryContext discoveryContext, ITestCaseDiscoverySink discoverySink)
-        {
-            if (sources == null)
-                return;
-
-            BoostTestAdapterSettings settings = BoostTestAdapterSettingsProvider.GetSettings(discoveryContext);
-
-            try
-            {
-                // Filter out any sources which are not of interest
-                if (!TestSourceFilter.IsNullOrEmpty(settings.Filters))
-                {
-                    sources = sources.Where(settings.Filters.ShouldInclude);
-                }
-
-                var results = _boostTestDiscovererFactory.GetDiscoverers(sources.ToList(), settings);
-                if (results == null)
-                    return;
-
-                // Test discovery
-                foreach (var discoverer in results)
-                {
-                    if (discoverer.Sources.Count > 0)
-                    {
-                        Logger.Info("Discovering ({0}):   -> [{1}]", discoverer.Discoverer.GetType().Name, string.Join(", ", discoverer.Sources));
-                        discoverer.Discoverer.DiscoverTests(discoverer.Sources, discoveryContext, discoverySink);
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                Logger.Exception(ex, "Exception caught while discovering tests: {0} ({1})", ex.Message, ex.HResult);
-            }
-        }
-    }
-}
+// (C) Copyright ETAS 2015.
+// 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)
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using BoostTestAdapter.Settings;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using BoostTestAdapter.Utility;
+
+namespace BoostTestAdapter
+{
+    [FileExtension(DllExtension)]
+    [FileExtension(ExeExtension)]
+    [DefaultExecutorUri(BoostTestExecutor.ExecutorUriString)]
+    public class BoostTestDiscoverer : ITestDiscoverer
+    {
+        #region Constants
+
+        public const string DllExtension = ".dll";
+        public const string ExeExtension = ".exe";
+
+        #endregion Constants
+
+        #region Constructors
+
+        /// <summary>
+        /// Default constructor. The default IBoostTestDiscovererFactory implementation is provided.
+        /// </summary>
+        public BoostTestDiscoverer()
+            :this(new BoostTestDiscovererFactory())
+        {
+        }
+
+        /// <summary>
+        /// Constructor.
+        /// </summary>
+        /// <param name="boostTestDiscovererFactory">A custom IBoostTestDiscovererFactory implementation.</param>
+        public BoostTestDiscoverer(IBoostTestDiscovererFactory boostTestDiscovererFactory)
+        {
+            _boostTestDiscovererFactory = boostTestDiscovererFactory;
+        }
+
+        #endregion
+
+
+        #region Members
+
+        private readonly IBoostTestDiscovererFactory _boostTestDiscovererFactory;
+
+        #endregion
+
+
+        #region ITestDiscoverer
+
+        /// <summary>
+        /// Method called by Visual Studio (discovered via reflection) for test enumeration
+        /// </summary>
+        /// <param name="sources">path, target name and target extensions to discover</param>
+        /// <param name="discoveryContext">discovery context settings</param>
+        /// <param name="logger"></param>
+        /// <param name="discoverySink">Unit test framework Sink</param>
+        /// <remarks>Entry point of the discovery procedure</remarks>
+        public void DiscoverTests(IEnumerable<string> sources, IDiscoveryContext discoveryContext, IMessageLogger logger, ITestCaseDiscoverySink discoverySink)
+        {
+#if DEBUG && LAUNCH_DEBUGGER
+            System.Diagnostics.Debugger.Launch();
+#endif
+
+            if (sources == null)
+                return;
+
+            Logger.Initialize(logger);
+
+            DiscoverTests(sources, discoveryContext, discoverySink);
+
+            Logger.Shutdown();
+        }
+
+        #endregion ITestDiscoverer
+
+        /// <summary>
+        /// Method called by BoostTestExecutor for test enumeration
+        /// </summary>
+        /// <param name="sources">path, target name and target extensions to discover</param>
+        /// <param name="discoveryContext">discovery context settings</param>
+        /// <param name="discoverySink">Unit test framework Sink</param>
+        /// <remarks>This method assumes that the Logger singleton is maintained by the caller.</remarks>
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes")]
+        public void DiscoverTests(IEnumerable<string> sources, IDiscoveryContext discoveryContext, ITestCaseDiscoverySink discoverySink)
+        {
+            if (sources == null)
+                return;
+
+            BoostTestAdapterSettings settings = BoostTestAdapterSettingsProvider.GetSettings(discoveryContext);
+
+            try
+            {
+                // Filter out any sources which are not of interest
+                if (!TestSourceFilter.IsNullOrEmpty(settings.Filters))
+                {
+                    sources = sources.Where(settings.Filters.ShouldInclude);
+                }
+
+                var results = _boostTestDiscovererFactory.GetDiscoverers(sources.ToList(), settings);
+                if (results == null)
+                    return;
+
+                // Test discovery
+                foreach (var discoverer in results)
+                {
+                    if (discoverer.Sources.Count > 0)
+                    {
+                        Logger.Info("Discovering ({0}):   -> [{1}]", discoverer.Discoverer.GetType().Name, string.Join(", ", discoverer.Sources));
+                        discoverer.Discoverer.DiscoverTests(discoverer.Sources, discoveryContext, discoverySink);
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                Logger.Exception(ex, "Exception caught while discovering tests: {0} ({1})", ex.Message, ex.HResult);
+            }
+        }
+    }
+}
diff --git a/BoostTestAdapter/Discoverers/ListContentDiscoverer.cs b/BoostTestAdapter/Discoverers/ListContentDiscoverer.cs
index 35c60fb..ed26cc4 100644
--- a/BoostTestAdapter/Discoverers/ListContentDiscoverer.cs
+++ b/BoostTestAdapter/Discoverers/ListContentDiscoverer.cs
@@ -88,7 +88,7 @@ public void DiscoverTests(IEnumerable<string> sources, IDiscoveryContext discove
                     if (vs != null)
                     {
                         Logger.Debug("Connected to Visual Studio {0} instance", vs.Version);
-                    }
+                    }
 
                     args.SetWorkingEnvironment(source, settings, vs);
                 }
@@ -122,12 +122,11 @@ public void DiscoverTests(IEnumerable<string> sources, IDiscoveryContext discove
                         using (FileStream stream = File.OpenRead(args.StandardErrorFile))
                         {
                             TestFrameworkDOTDeserialiser deserialiser = new TestFrameworkDOTDeserialiser(source);
-
-                            // Pass in a visitor to avoid a 2-pass loop in order to notify test cases to VS
-                            //
-                            // NOTE Due to deserialisation, make sure that only test cases are visited. Test
-                            //      suites may be visited after their child test cases are visited.
-                            deserialiser.Deserialise(stream, new VSDiscoveryVisitorTestsOnly(source, discoverySink));
+                            TestFramework framework = deserialiser.Deserialise(stream);
+                            if ((framework != null) && (framework.MasterTestSuite != null))
+                            {
+                                framework.MasterTestSuite.Apply(new VSDiscoveryVisitor(source, discoverySink));
+                            }
                         }
                     }
                 }
@@ -139,27 +138,5 @@ public void DiscoverTests(IEnumerable<string> sources, IDiscoveryContext discove
         }
 
         #endregion IBoostTestDiscoverer
-        
-        /// <summary>
-        /// A specification of VSDiscoveryVisitor which limits visitation to tests only.
-        /// Allows for optimal visitation during DOT deserialisation.
-        /// </summary>
-        private class VSDiscoveryVisitorTestsOnly : VSDiscoveryVisitor
-        {
-            public VSDiscoveryVisitorTestsOnly(string source, ITestCaseDiscoverySink sink)
-                : base(source, sink)
-            {
-            }
-
-            protected override bool ShouldVisit(TestSuite suite)
-            {
-                return false;
-            }
-
-            protected override bool ShouldVisit(TestCase test)
-            {
-                return true;
-            }
-        }
     }
 }
diff --git a/BoostTestAdapter/Discoverers/VSDiscoveryVisitor.cs b/BoostTestAdapter/Discoverers/VSDiscoveryVisitor.cs
index b04e60b..4f7891a 100644
--- a/BoostTestAdapter/Discoverers/VSDiscoveryVisitor.cs
+++ b/BoostTestAdapter/Discoverers/VSDiscoveryVisitor.cs
@@ -1,185 +1,185 @@
-// (C) Copyright ETAS 2015.
-// 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)
-
-using System.Diagnostics;
-
-using BoostTestAdapter.Boost.Test;
-
-using BoostTestAdapter.Utility;
-using BoostTestAdapter.Utility.VisualStudio;
-
-using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
-
-using TestCase = BoostTestAdapter.Boost.Test.TestCase;
-using VSTestCase = Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase;
-using System.IO;
-
-namespace BoostTestAdapter.Discoverers
-{
-    /// <summary>
-    /// ITestVisitor implementation. Visits TestCases and registers them
-    /// with the supplied ITestCaseDiscoverySink.
-    /// </summary>
-    public class VSDiscoveryVisitor : ITestVisitor
-    {
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        /// <param name="source">The source test module which contains the discovered tests</param>
-        /// <param name="sink">The ITestCaseDiscoverySink which will have tests registered with</param>
-        public VSDiscoveryVisitor(string source, ITestCaseDiscoverySink sink)
-        {
-            this.Source = source;
-            this.DiscoverySink = sink;
-            this.OutputLog = true;
-        }
-
-        /// <summary>
-        /// The test module source file path
-        /// </summary>
-        public string Source { get; private set; }
-
-        /// <summary>
-        /// Whether the module should output to the logger regarding relative paths
-        /// </summary>
-        public bool OutputLog { get; private set; }
-
-        /// <summary>
-        /// The Visual Studio DiscoverySink which is used to notify test discovery
-        /// </summary>
-        public ITestCaseDiscoverySink DiscoverySink { get; private set; }
-        
-        #region ITestVisitor
-
-        public void Visit(TestSuite testSuite)
-        {
-            Code.Require(testSuite, "testSuite");
-
-            if (ShouldVisit(testSuite))
-            {
-                foreach (TestUnit child in testSuite.Children)
-                {
-                    child.Apply(this);
-                }
-            }
-        }
-
-        public void Visit(TestCase testCase)
-        {
-            Code.Require(testCase, "testCase");
-
-            if (ShouldVisit(testCase))
-            {
-                VSTestCase test = GenerateTestCase(testCase);
-
-                // Send to discovery sink
-                if (null != this.DiscoverySink)
-                {
-                    Logger.Info("Found test: {0}", test.FullyQualifiedName);
-                    this.DiscoverySink.SendTestCase(test);
-                }
-            }
-        }
-
-        #endregion ITestVisitor
-
-        /// <summary>
-        /// Generates a Visual Studio equivalent test case structure.
-        /// </summary>
-        /// <param name="testCase">The Boost.Test.TestCase to convert.</param>
-        /// <returns>An equivalent Visual Studio TestCase structure to the one provided.</returns>
-       
-        private VSTestCase GenerateTestCase(TestCase testCase)
-        {
-            VSTestCase test = new VSTestCase(
-                testCase.FullyQualifiedName,
-                BoostTestExecutor.ExecutorUri,
-                this.Source
-            );
-
-            test.DisplayName = testCase.Name;
-            
-            if (testCase.Source != null)
-            {
-                // NOTE As of Boost 1.61, this warning might be triggered when BOOST_DATA_TEST_CASEs are used due to irregular DOT output
-                if (!Path.IsPathRooted(testCase.Source.File) && this.OutputLog)
-                {
-                    Logger.Info("Relative Paths are being used. Please note that test navigation from the Test Explorer window will not be available. To enable such functionality, the Use Full Paths setting under C++ -> Advanced in the project's Property Page must be set to Yes (/FC).");
-                    this.OutputLog = false;
-                }
-
-                test.CodeFilePath = testCase.Source.File;
-                test.LineNumber = testCase.Source.LineNumber;
-            }
-
-            // Register the test suite as a trait
-            test.Traits.Add(new Trait(VSTestModel.TestSuiteTrait, GetParentFullyQualifiedName(testCase)));
-            
-            // Register enabled and disabled as traits
-            test.Traits.Add(new Trait(VSTestModel.StatusTrait, (testCase.DefaultEnabled ? VSTestModel.TestEnabled : VSTestModel.TestDisabled)));
-
-            TestUnit unit = testCase;
-            while (unit != null)
-            {
-                foreach (string label in unit.Labels)
-                {
-                    // Register each and every label as an individual trait
-                    test.Traits.Add(new Trait(label, string.Empty));
-                }             
-
-                // Test cases inherit the labels of parent test units
-                // Reference: http://www.boost.org/doc/libs/1_60_0/libs/test/doc/html/boost_test/tests_organization/tests_grouping.html
-                unit = unit.Parent;
-            }
-
-            return test;
-        }
-
-        /// <summary>
-        /// States whether the provided test suite should be visited
-        /// </summary>
-        /// <param name="unit">The test suite under consideration</param>
-        /// <returns>true if the provided TestSuite should be visited; false otherwise</returns>
-        protected virtual bool ShouldVisit(TestSuite suite)
-        {
-            return true;
-        }
-
-        /// <summary>
-        /// States whether the provided test case should be visited
-        /// </summary>
-        /// <param name="unit">The test case under consideration</param>
-        /// <returns>true if the provided TestCase should be visited; false otherwise</returns>
-        protected virtual bool ShouldVisit(TestCase test)
-        {
-            return true;
-        }
-
-        /// <summary>
-        /// Provides the fully qualified name of the parent TestUnit of the provided TestCase
-        /// </summary>
-        /// <param name="test">The TestCase whose parent TestUnit is to be queried</param>
-        /// <returns>The fully qualified name of the parent TestUnit</returns>
-        private static string GetParentFullyQualifiedName(TestCase test)
-        {
-            Code.Require(test, "test");
-
-            TestUnit parent = test.Parent;
-
-            // A test case must have a parent, at the very least, the master test suite should be the parent of a test case
-            Debug.Assert(parent != null);
-
-            // Since the master test suite name is not included in the fully qualified name, identify
-            // this edge case and explicitly return the master test suite name in such cases.
-            if (parent.Parent == null)
-            {
-                return string.IsNullOrEmpty(parent.Name) ? QualifiedNameBuilder.DefaultMasterTestSuiteName : parent.Name;
-            }
-
-            return parent.FullyQualifiedName;
-        }
-    }
-}
+// (C) Copyright ETAS 2015.
+// 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)
+
+using System.IO;
+using System.Diagnostics;
+
+using BoostTestAdapter.Boost.Test;
+
+using BoostTestAdapter.Utility;
+using BoostTestAdapter.Utility.VisualStudio;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
+
+using TestCase = BoostTestAdapter.Boost.Test.TestCase;
+using VSTestCase = Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase;
+
+namespace BoostTestAdapter.Discoverers
+{
+    /// <summary>
+    /// ITestVisitor implementation. Visits TestCases and registers them
+    /// with the supplied ITestCaseDiscoverySink.
+    /// </summary>
+    public class VSDiscoveryVisitor : ITestVisitor
+    {
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="source">The source test module which contains the discovered tests</param>
+        /// <param name="sink">The ITestCaseDiscoverySink which will have tests registered with</param>
+        public VSDiscoveryVisitor(string source, ITestCaseDiscoverySink sink)
+        {
+            Code.Require(sink, "sink");
+
+            this.Source = source;
+            this.DiscoverySink = sink;
+            this.OutputLog = true;
+        }
+
+        /// <summary>
+        /// The test module source file path
+        /// </summary>
+        public string Source { get; private set; }
+
+        /// <summary>
+        /// Whether the module should output to the logger regarding relative paths
+        /// </summary>
+        private bool OutputLog { get; set; }
+
+        /// <summary>
+        /// The Visual Studio DiscoverySink which is used to notify test discovery
+        /// </summary>
+        public ITestCaseDiscoverySink DiscoverySink { get; private set; }
+        
+        #region ITestVisitor
+
+        public void Visit(TestSuite testSuite)
+        {
+            Code.Require(testSuite, "testSuite");
+            
+            if (BoostDataTestCaseVerifier.IsBoostDataTestCase(testSuite))
+            {
+                foreach (TestUnit child in testSuite.Children)
+                {
+                    // NOTE Since we have asserted that the suite is a BOOST_DATA_TEST_CASE,
+                    //      all child instances are to be of type TestCase
+                    
+                    var displayName = testSuite.Name + '/' + child.Name;
+                    Visit((TestCase)child, displayName);
+                }
+            }
+            else
+            {
+                foreach (TestUnit child in testSuite.Children)
+                {
+                    child.Apply(this);
+                }
+            }
+        }
+
+        public void Visit(TestCase testCase)
+        {
+            Code.Require(testCase, "testCase");
+
+            Visit(testCase, testCase.Name);
+        }
+
+        #endregion ITestVisitor
+
+        /// <summary>
+        /// Visits the provided TestCase
+        /// </summary>
+        /// <param name="testCase">The TestCase which is to be visited</param>
+        /// <param name="displayName">The test case display name to use (overrides the test case name)</param>
+        private void Visit(TestCase testCase, string displayName)
+        {
+            Code.Require(testCase, "testCase");
+
+            VSTestCase test = GenerateTestCase(testCase);
+            test.DisplayName = string.IsNullOrEmpty(displayName) ? test.DisplayName : displayName;
+
+            // Send to discovery sink
+            Logger.Info("Found test: {0}", test.FullyQualifiedName);
+            this.DiscoverySink.SendTestCase(test);
+        }
+
+        /// <summary>
+        /// Generates a Visual Studio equivalent test case structure.
+        /// </summary>
+        /// <param name="testCase">The Boost.Test.TestCase to convert.</param>
+        /// <returns>An equivalent Visual Studio TestCase structure to the one provided.</returns>
+
+        private VSTestCase GenerateTestCase(TestCase testCase)
+        {
+            VSTestCase test = new VSTestCase(
+                testCase.FullyQualifiedName,
+                BoostTestExecutor.ExecutorUri,
+                this.Source
+            );
+
+            test.DisplayName = testCase.Name;
+            
+            if (testCase.Source != null)
+            {
+                // NOTE As of Boost 1.61, this warning might be triggered when BOOST_DATA_TEST_CASEs are used due to irregular DOT output
+                if (!Path.IsPathRooted(testCase.Source.File) && this.OutputLog)
+                {
+                    Logger.Info("Relative Paths are being used. Please note that test navigation from the Test Explorer window will not be available. To enable such functionality, the Use Full Paths setting under C++ -> Advanced in the project's Property Page must be set to Yes (/FC).");
+                    this.OutputLog = false;
+                }
+
+                test.CodeFilePath = testCase.Source.File;
+                test.LineNumber = testCase.Source.LineNumber;
+            }
+
+            // Register the test suite as a trait
+            test.Traits.Add(new Trait(VSTestModel.TestSuiteTrait, GetParentFullyQualifiedName(testCase)));
+            
+            // Register enabled and disabled as traits
+            test.Traits.Add(new Trait(VSTestModel.StatusTrait, (testCase.DefaultEnabled ? VSTestModel.TestEnabled : VSTestModel.TestDisabled)));
+
+            TestUnit unit = testCase;
+            while (unit != null)
+            {
+                foreach (string label in unit.Labels)
+                {
+                    // Register each and every label as an individual trait
+                    test.Traits.Add(new Trait(label, string.Empty));
+                }             
+
+                // Test cases inherit the labels of parent test units
+                // Reference: http://www.boost.org/doc/libs/1_60_0/libs/test/doc/html/boost_test/tests_organization/tests_grouping.html
+                unit = unit.Parent;
+            }
+
+            return test;
+        }
+
+        /// <summary>
+        /// Provides the fully qualified name of the parent TestUnit of the provided TestCase
+        /// </summary>
+        /// <param name="test">The TestCase whose parent TestUnit is to be queried</param>
+        /// <returns>The fully qualified name of the parent TestUnit</returns>
+        private static string GetParentFullyQualifiedName(TestCase test)
+        {
+            Code.Require(test, "test");
+
+            TestUnit parent = test.Parent;
+
+            // A test case must have a parent, at the very least, the master test suite should be the parent of a test case
+            Debug.Assert(parent != null);
+
+            // Since the master test suite name is not included in the fully qualified name, identify
+            // this edge case and explicitly return the master test suite name in such cases.
+            if (parent.Parent == null)
+            {
+                return string.IsNullOrEmpty(parent.Name) ? QualifiedNameBuilder.DefaultMasterTestSuiteName : parent.Name;
+            }
+
+            return parent.FullyQualifiedName;
+        }
+    }
+}
diff --git a/BoostTestAdapter/Settings/BoostTestAdapterSettings.cs b/BoostTestAdapter/Settings/BoostTestAdapterSettings.cs
index 4e6f0cf..50976cd 100644
--- a/BoostTestAdapter/Settings/BoostTestAdapterSettings.cs
+++ b/BoostTestAdapter/Settings/BoostTestAdapterSettings.cs
@@ -210,6 +210,7 @@ public bool UseBoost162Workaround
         /// <summary>
         /// Determines a delay represented in milliseconds which will be forced after the execution of each test batch.
         /// </summary>
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", MessageId = "PostTest")]
         [DefaultValue(0)]
         public int PostTestDelay { get; set; }
 
diff --git a/BoostTestAdapter/TestBatch/TestSuiteTestBatchStrategy.cs b/BoostTestAdapter/TestBatch/TestSuiteTestBatchStrategy.cs
index de15ee0..ca0f1be 100644
--- a/BoostTestAdapter/TestBatch/TestSuiteTestBatchStrategy.cs
+++ b/BoostTestAdapter/TestBatch/TestSuiteTestBatchStrategy.cs
@@ -1,64 +1,63 @@
-// (C) Copyright ETAS 2015.
-// 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)
-
-using System.Collections.Generic;
-using System.Linq;
-using BoostTestAdapter.Boost.Runner;
-using BoostTestAdapter.Settings;
-using BoostTestAdapter.Utility;
-using BoostTestAdapter.Utility.VisualStudio;
-
-using VSTestCase = Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase;
-
-namespace BoostTestAdapter.TestBatch
-{
-    /// <summary>
-    /// An ITestBatchingStrategy which allocates a test run for test suites. All tests
-    /// contained within the same test suite are executed in one test run.
-    /// </summary>
-    public class TestSuiteTestBatchStrategy : TestBatchStrategy
-    {
-        public TestSuiteTestBatchStrategy(IBoostTestRunnerFactory testRunnerFactory, BoostTestAdapterSettings settings, CommandLineArgsBuilder argsBuilder) :
-            base(testRunnerFactory, settings, argsBuilder)
-        {
-        }
-
-        #region TestBatchStrategy
-
-        public override IEnumerable<TestRun> BatchTests(IEnumerable<VSTestCase> tests)
-        {
-            BoostTestRunnerSettings adaptedSettings = this.Settings.TestRunnerSettings.Clone();
-            adaptedSettings.Timeout = -1;
-
-            // Group by source
-            IEnumerable<IGrouping<string, VSTestCase>> sources = tests.GroupBy(test => test.Source);
-            foreach (IGrouping<string, VSTestCase> source in sources)
-            {
-                IBoostTestRunner runner = GetTestRunner(source.Key);
-                if (runner == null)
-                {
-                    continue;
-                }
-
-                // Group by test suite
-                var suiteGroups = source.GroupBy(test => test.Traits.First(trait => (trait.Name == VSTestModel.TestSuiteTrait)).Value);
-                foreach (var suiteGroup in suiteGroups)
-                {
-                    BoostTestRunnerCommandLineArgs args = BuildCommandLineArgs(source.Key);
-                    foreach (VSTestCase test in suiteGroup)
-                    {
-                        // List all tests by display name
-                        // but ensure that the first test is fully qualified so that remaining tests are taken relative to this test suite
-                        args.Tests.Add((args.Tests.Count == 0) ? test.FullyQualifiedName : test.DisplayName);
-                    }
-
-                    yield return new TestRun(runner, suiteGroup, args, adaptedSettings);
-                }
-            }
-        }
-
-        #endregion TestBatchStrategy
-    }
+// (C) Copyright ETAS 2015.
+// 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)
+
+using System.Collections.Generic;
+using System.Linq;
+using BoostTestAdapter.Boost.Runner;
+using BoostTestAdapter.Settings;
+using BoostTestAdapter.Utility;
+using BoostTestAdapter.Utility.VisualStudio;
+
+using VSTestCase = Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase;
+
+namespace BoostTestAdapter.TestBatch
+{
+    /// <summary>
+    /// An ITestBatchingStrategy which allocates a test run for test suites. All tests
+    /// contained within the same test suite are executed in one test run.
+    /// </summary>
+    public class TestSuiteTestBatchStrategy : TestBatchStrategy
+    {
+        public TestSuiteTestBatchStrategy(IBoostTestRunnerFactory testRunnerFactory, BoostTestAdapterSettings settings, CommandLineArgsBuilder argsBuilder) :
+            base(testRunnerFactory, settings, argsBuilder)
+        {
+        }
+
+        #region TestBatchStrategy
+
+        public override IEnumerable<TestRun> BatchTests(IEnumerable<VSTestCase> tests)
+        {
+            BoostTestRunnerSettings adaptedSettings = this.Settings.TestRunnerSettings.Clone();
+            adaptedSettings.Timeout = -1;
+
+            // Group by source
+            IEnumerable<IGrouping<string, VSTestCase>> sources = tests.GroupBy(test => test.Source);
+            foreach (IGrouping<string, VSTestCase> source in sources)
+            {
+                IBoostTestRunner runner = GetTestRunner(source.Key);
+                if (runner == null)
+                {
+                    continue;
+                }
+
+                // Group by test suite
+                var suiteGroups = source.GroupBy(test => test.Traits.First(trait => (trait.Name == VSTestModel.TestSuiteTrait)).Value);
+                foreach (var suiteGroup in suiteGroups)
+                {
+                    BoostTestRunnerCommandLineArgs args = BuildCommandLineArgs(source.Key);
+                    foreach (VSTestCase test in suiteGroup)
+                    {
+                        // List all tests by name but ensure that the first test is fully qualified so that remaining tests are taken relative to this test suite
+                        args.Tests.Add((args.Tests.Count == 0) ? test.FullyQualifiedName : QualifiedNameBuilder.FromString(test.FullyQualifiedName).Peek());
+                    }
+
+                    yield return new TestRun(runner, suiteGroup, args, adaptedSettings);
+                }
+            }
+        }
+
+        #endregion TestBatchStrategy
+    }
 }
\ No newline at end of file
diff --git a/BoostTestAdapter/Utility/BoostDataTestCaseVerifier.cs b/BoostTestAdapter/Utility/BoostDataTestCaseVerifier.cs
new file mode 100644
index 0000000..a63ba7d
--- /dev/null
+++ b/BoostTestAdapter/Utility/BoostDataTestCaseVerifier.cs
@@ -0,0 +1,95 @@
+// (C) Copyright ETAS 2015.
+// 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)
+
+using System.Text.RegularExpressions;
+
+using BoostTestAdapter.Boost.Test;
+
+namespace BoostTestAdapter.Utility
+{
+    /// <summary>
+    /// Utility class which determines if a test suite is, in fact, a BOOST_DATA_TEST_CASE
+    /// </summary>
+    public class BoostDataTestCaseVerifier : ITestVisitor
+    {
+        /// <summary>
+        /// The test case name pattern used for BOOST_DATA_TEST_CASE instances
+        /// </summary>
+        private static readonly Regex _dataTestCaseNamePattern = new Regex(@"^_\d+$");
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="testSuite">The test suite which is to be determined if it is a BOOST_DATA_TEST_CASE</param>
+        private BoostDataTestCaseVerifier(TestSuite testSuite)
+        {
+            this.RootTestSuite = testSuite;
+            this.DataTestCase = true;
+        }
+
+        /// <summary>
+        /// The root test suite which is to be determined if it is a BOOST_DATA_TEST_CASE
+        /// </summary>
+        public TestSuite RootTestSuite { get; set; }
+
+        /// <summary>
+        /// Flag identifying if RootTestSuite is a BOOST_DATA_TEST_CASE
+        /// </summary>
+        public bool DataTestCase { get; set; }
+        
+        #region ITestVisitor
+
+        public void Visit(TestSuite testSuite)
+        {
+            Code.Require(testSuite, "testSuite");
+
+            // A BOOST_DATA_TEST_CASE should only have child test cases
+            // Any child test suite implies that the suite is not a BOOST_DATA_TEST_CASE
+            DataTestCase = ((testSuite == RootTestSuite) && (testSuite.Source != null));
+            
+            if (DataTestCase)
+            {   
+                foreach (var child in testSuite.Children)
+                {
+                    child.Apply(this);
+
+                    if (!DataTestCase)
+                    {
+                        break;
+                    }
+                }
+            }
+        }
+
+        public void Visit(TestCase testCase)
+        {
+            Code.Require(testCase, "testCase");
+
+            // A BOOST_DATA_TEST_CASE test has the following properties:
+            // - It's name is of the format '_[number]' (where [number] increments per test case)
+            // - It has the same line number as all other data test case instance
+            // - It has the same source file reference as all other data test case instances
+            DataTestCase = (
+                (testCase.Source.LineNumber == RootTestSuite.Source.LineNumber) &&
+                (testCase.Source.File == RootTestSuite.Source.File) &&
+                _dataTestCaseNamePattern.IsMatch(testCase.Name)
+            );
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Determines if the provided test suite is, in fact, a BOOST_DATA_TEST_CASE
+        /// </summary>
+        /// <param name="testSuite">The test suite which is to be determined if it is a BOOST_DATA_TEST_CASE</param>
+        /// <returns>true if the provided test suite is a BOOST_DATA_TEST_CASE; false otherwise</returns>
+        public static bool IsBoostDataTestCase(TestSuite testSuite)
+        {
+            var verifier = new BoostDataTestCaseVerifier(testSuite);
+            testSuite.Apply(verifier);
+            return verifier.DataTestCase;
+        }
+    }
+}
diff --git a/BoostTestAdapter/Utility/QualifiedNameBuilder.cs b/BoostTestAdapter/Utility/QualifiedNameBuilder.cs
index dd8b06d..05f2647 100644
--- a/BoostTestAdapter/Utility/QualifiedNameBuilder.cs
+++ b/BoostTestAdapter/Utility/QualifiedNameBuilder.cs
@@ -1,224 +1,219 @@
-// (C) Copyright ETAS 2015.
-// 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)
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using BoostTestAdapter.Boost.Test;
-
-namespace BoostTestAdapter.Utility
-{
-    /// <summary>
-    /// Builds qualified names for Boost Test Test Units.
-    /// </summary>
-    public class QualifiedNameBuilder : ICloneable
-    {
-        #region Constants
-
-        private const string Separator = "/";
-
-        #endregion Constants
-
-        #region Constructors
-
-        /// <summary>
-        /// Default constructor.
-        /// </summary>
-        public QualifiedNameBuilder()
-            : this(new List<string>())
-        {
-        }
-
-        /// <summary>
-        /// Internal constructor.
-        /// </summary>
-        /// <param name="path">The initial fully qualified path</param>
-        private QualifiedNameBuilder(List<string> path)
-        {
-            this.Path = path;
-        }
-
-        /// <summary>
-        /// Constructor. Initializes this qualified name based on the provided TestUnit.
-        /// </summary>
-        /// <param name="root">The TestUnit from which this qualified name is to be initialized.</param>
-        public QualifiedNameBuilder(TestUnit root) :
-            this()
-        {
-            Initialize(root);
-        }
-
-        #endregion Constructors
-
-        #region Helper Methods
-
-        /// <summary>
-        /// Helper function which aids in the implementation of QualifiedNameBuilder(TestUnit) constructor
-        /// </summary>
-        /// <param name="root">The test unit which is to be listed</param>
-        private void Initialize(TestUnit root)
-        {
-            if (root == null)
-            {
-                return;
-            }
-
-            Initialize(root.Parent);
-
-            this.Push(root);
-        }
-
-        #endregion Helper Methods
-
-        #region Properties
-
-        /// <summary>
-        /// The Master Test Suite local name.
-        /// </summary>
-        public string MasterTestSuite
-        {
-            get { return this.Path.FirstOrDefault(); }
-        }
-
-        /// <summary>
-        /// Stack which contains the entries for this qualified name.
-        /// </summary>
-        private List<string> Path { get; set; }
-
-        /// <summary>
-        /// The depth of this fully qualified name.
-        /// A depth of 0 implies an empty object.
-        /// </summary>
-        public int Level { get { return this.Path.Count; } }
-
-        #endregion Properties
-
-        #region Constant Properties
-
-        /// <summary>
-        /// Identifies the standard depth level at which the MasterTestSuite is located.
-        /// </summary>
-        public static uint MasterTestSuiteLevel { get { return 1; } }
-
-        /// <summary>
-        /// Identifies the default MasterTestSuite test suite name.
-        /// </summary>
-        public static string DefaultMasterTestSuiteName { get { return "Master Test Suite"; } }
-
-        #endregion Constant Properties
-
-        /// <summary>
-        /// Pushes the test unit on this structure.
-        /// </summary>
-        /// <param name="unit">The test unit to push</param>
-        /// <returns>this</returns>
-        public QualifiedNameBuilder Push(TestUnit unit)
-        {
-            Utility.Code.Require(unit, "unit");
-
-            return this.Push(unit.Name);
-        }
-
-        /// <summary>
-        /// Pushes the (local) name of a test unit on this structure.
-        /// </summary>
-        /// <param name="name">The test unit (local) name to push</param>
-        /// <returns>this</returns>
-        public QualifiedNameBuilder Push(string name)
-        {
-            this.Path.Add(name);
-
-            return this;
-        }
-
-        /// <summary>
-        /// Peeks at the last (local) name pushed on this builder.
-        /// </summary>
-        /// <returns>The last (local) name pushed on this builder.</returns>
-        public string Peek()
-        {
-            return (this.Path.Count > 0) ? this.Path[this.Path.Count - 1] : null;
-        }
-
-        /// <summary>
-        /// Pops the last test unit from this instance.
-        /// </summary>
-        /// <returns>this</returns>
-        public QualifiedNameBuilder Pop()
-        {
-            if (this.Path.Count > 0)
-            {
-                this.Path.RemoveAt(this.Path.Count - 1);
-            }
-
-            return this;
-        }
-
-        #region object overrides
-
-        /// <summary>
-        /// Provides a string representation of this fully qualified name as expected by Boost Test standards.
-        /// </summary>
-        /// <returns>A string representation of this fully qualified name as expected by Boost Test standards.</returns>
-        public override string ToString()
-        {
-            // Skip the Master Test Suite. Master Test Suite is omitted in qualified name.
-            return string.Join(Separator, this.Path.Skip(1));
-        }
-
-        #endregion object overrides
-
-        /// <summary>
-        /// Factory method which creates a QualifiedNameBuilder
-        /// from an already existing qualified name string.
-        /// </summary>
-        /// <param name="name">The qualified name</param>
-        /// <returns>A QualifiedNameBuilder from the provided string.</returns>
-        public static QualifiedNameBuilder FromString(string name)
-        {
-            // Assume Master Test Suite name
-            return FromString(DefaultMasterTestSuiteName, name);
-        }
-
-        /// <summary>
-        /// Factory method which creates a QualifiedNameBuilder
-        /// from an already existing qualified name string.
-        /// </summary>
-        /// <param name="masterSuite">The local name of the master test suite</param>
-        /// <param name="name">The qualified name</param>
-        /// <returns>A QualifiedNameBuilder from the provided string.</returns>
-        public static QualifiedNameBuilder FromString(string masterSuite, string name)
-        {
-            Utility.Code.Require(masterSuite, "masterSuite");
-            Utility.Code.Require(name, "name");
-
-            QualifiedNameBuilder builder = new QualifiedNameBuilder();
-
-            builder.Push(masterSuite);
-
-            foreach (string part in name.Split(new string[] { Separator }, StringSplitOptions.RemoveEmptyEntries))
-            {
-                builder.Push(part);
-            }
-
-            return builder;
-        }
-
-        #region ICloneable
-
-        object ICloneable.Clone()
-        {
-            return this.Clone();
-        }
-
-        public QualifiedNameBuilder Clone()
-        {
-            // NOTE Make an explicit copy of the path
-            return new QualifiedNameBuilder(new List<string>(this.Path));
-        }
-
-        #endregion ICloneable
-    }
+// (C) Copyright ETAS 2015.
+// 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)
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using BoostTestAdapter.Boost.Test;
+
+namespace BoostTestAdapter.Utility
+{
+    /// <summary>
+    /// Builds qualified names for Boost Test Test Units.
+    /// </summary>
+    public class QualifiedNameBuilder : ICloneable
+    {
+        #region Constants
+
+        private const string Separator = "/";
+
+        #endregion Constants
+
+        #region Constructors
+
+        /// <summary>
+        /// Default constructor.
+        /// </summary>
+        public QualifiedNameBuilder()
+            : this(new List<string>())
+        {
+        }
+
+        /// <summary>
+        /// Internal constructor.
+        /// </summary>
+        /// <param name="path">The initial fully qualified path</param>
+        private QualifiedNameBuilder(List<string> path)
+        {
+            this.Path = path;
+        }
+
+        /// <summary>
+        /// Constructor. Initializes this qualified name based on the provided TestUnit.
+        /// </summary>
+        /// <param name="root">The TestUnit from which this qualified name is to be initialized.</param>
+        public QualifiedNameBuilder(TestUnit root) :
+            this()
+        {
+            Initialize(root);
+        }
+
+        #endregion Constructors
+
+        #region Helper Methods
+
+        /// <summary>
+        /// Helper function which aids in the implementation of QualifiedNameBuilder(TestUnit) constructor
+        /// </summary>
+        /// <param name="root">The test unit which is to be listed</param>
+        private void Initialize(TestUnit root)
+        {
+            if (root == null)
+            {
+                return;
+            }
+
+            Initialize(root.Parent);
+
+            this.Push(root);
+        }
+
+        #endregion Helper Methods
+
+        #region Properties
+
+        /// <summary>
+        /// The Master Test Suite local name.
+        /// </summary>
+        public string MasterTestSuite
+        {
+            get { return this.Path.FirstOrDefault(); }
+        }
+
+        /// <summary>
+        /// Stack which contains the entries for this qualified name.
+        /// </summary>
+        private List<string> Path { get; set; }
+
+        /// <summary>
+        /// The depth of this fully qualified name.
+        /// A depth of 0 implies an empty object.
+        /// </summary>
+        public int Level { get { return this.Path.Count; } }
+
+        #endregion Properties
+
+        #region Constant Properties
+        
+        /// <summary>
+        /// Identifies the default MasterTestSuite test suite name.
+        /// </summary>
+        public static string DefaultMasterTestSuiteName { get { return "Master Test Suite"; } }
+
+        #endregion Constant Properties
+
+        /// <summary>
+        /// Pushes the test unit on this structure.
+        /// </summary>
+        /// <param name="unit">The test unit to push</param>
+        /// <returns>this</returns>
+        public QualifiedNameBuilder Push(TestUnit unit)
+        {
+            Utility.Code.Require(unit, "unit");
+
+            return this.Push(unit.Name);
+        }
+
+        /// <summary>
+        /// Pushes the (local) name of a test unit on this structure.
+        /// </summary>
+        /// <param name="name">The test unit (local) name to push</param>
+        /// <returns>this</returns>
+        public QualifiedNameBuilder Push(string name)
+        {
+            this.Path.Add(name);
+
+            return this;
+        }
+
+        /// <summary>
+        /// Peeks at the last (local) name pushed on this builder.
+        /// </summary>
+        /// <returns>The last (local) name pushed on this builder.</returns>
+        public string Peek()
+        {
+            return (this.Path.Count > 0) ? this.Path[this.Path.Count - 1] : null;
+        }
+
+        /// <summary>
+        /// Pops the last test unit from this instance.
+        /// </summary>
+        /// <returns>this</returns>
+        public QualifiedNameBuilder Pop()
+        {
+            if (this.Path.Count > 0)
+            {
+                this.Path.RemoveAt(this.Path.Count - 1);
+            }
+
+            return this;
+        }
+
+        #region object overrides
+
+        /// <summary>
+        /// Provides a string representation of this fully qualified name as expected by Boost Test standards.
+        /// </summary>
+        /// <returns>A string representation of this fully qualified name as expected by Boost Test standards.</returns>
+        public override string ToString()
+        {
+            // Skip the Master Test Suite. Master Test Suite is omitted in qualified name.
+            return string.Join(Separator, this.Path.Skip(1));
+        }
+
+        #endregion object overrides
+
+        /// <summary>
+        /// Factory method which creates a QualifiedNameBuilder
+        /// from an already existing qualified name string.
+        /// </summary>
+        /// <param name="name">The qualified name</param>
+        /// <returns>A QualifiedNameBuilder from the provided string.</returns>
+        public static QualifiedNameBuilder FromString(string name)
+        {
+            // Assume Master Test Suite name
+            return FromString(DefaultMasterTestSuiteName, name);
+        }
+
+        /// <summary>
+        /// Factory method which creates a QualifiedNameBuilder
+        /// from an already existing qualified name string.
+        /// </summary>
+        /// <param name="masterSuite">The local name of the master test suite</param>
+        /// <param name="name">The qualified name</param>
+        /// <returns>A QualifiedNameBuilder from the provided string.</returns>
+        public static QualifiedNameBuilder FromString(string masterSuite, string name)
+        {
+            Utility.Code.Require(masterSuite, "masterSuite");
+            Utility.Code.Require(name, "name");
+
+            QualifiedNameBuilder builder = new QualifiedNameBuilder();
+
+            builder.Push(masterSuite);
+
+            foreach (string part in name.Split(new string[] { Separator }, StringSplitOptions.RemoveEmptyEntries))
+            {
+                builder.Push(part);
+            }
+
+            return builder;
+        }
+
+        #region ICloneable
+
+        object ICloneable.Clone()
+        {
+            return this.Clone();
+        }
+
+        public QualifiedNameBuilder Clone()
+        {
+            // NOTE Make an explicit copy of the path
+            return new QualifiedNameBuilder(new List<string>(this.Path));
+        }
+
+        #endregion ICloneable
+    }
 }
\ No newline at end of file
diff --git a/BoostTestAdapter/Utility/VisualStudio/DefaultDiscoverySink.cs b/BoostTestAdapter/Utility/VisualStudio/DefaultTestCaseDiscoverySink.cs
similarity index 96%
rename from BoostTestAdapter/Utility/VisualStudio/DefaultDiscoverySink.cs
rename to BoostTestAdapter/Utility/VisualStudio/DefaultTestCaseDiscoverySink.cs
index 8410142..f0562e1 100644
--- a/BoostTestAdapter/Utility/VisualStudio/DefaultDiscoverySink.cs
+++ b/BoostTestAdapter/Utility/VisualStudio/DefaultTestCaseDiscoverySink.cs
@@ -1,66 +1,66 @@
-// (C) Copyright ETAS 2015.
-// 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)
-
-using System.Collections.Generic;
-using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
-
-namespace BoostTestAdapter.Utility.VisualStudio
-{
-    /// <summary>
-    /// An ITestCaseDiscoverySink implementation. Aggregates all tests
-    /// within an internal collection which is publicly accessible.
-    /// </summary>
-    public class DefaultTestCaseDiscoverySink : ITestCaseDiscoverySink
-    {
-        private ICollection<TestCase> _tests = new HashSet<TestCase>(new TestCaseComparer());
-
-        /// <summary>
-        /// The collection of discovered TestCases
-        /// </summary>
-        public IEnumerable<TestCase> Tests
-        {
-            get
-            {
-                return _tests;
-            }
-        }
-
-        #region ITestCaseDiscoverySink
-
-        public void SendTestCase(TestCase discoveredTest)
-        {
-            this._tests.Add(discoveredTest);
-        }
-
-        #endregion ITestCaseDiscoverySink
-    }
-    
-    /// <summary>
-    /// TestCase equality comparer which defines equality based on the TestCase's
-    /// Fully Qualified Name.
-    /// </summary>
-    public class TestCaseComparer : IEqualityComparer<TestCase>
-    {
-        #region IEqualityComparer<TestCase>
-
-        public bool Equals(TestCase x, TestCase y)
-        {
-            Utility.Code.Require(x, "x");
-            Utility.Code.Require(y, "y");
-
-            return (x.FullyQualifiedName == y.FullyQualifiedName) && (x.Source == y.Source);
-        }
-
-        public int GetHashCode(TestCase obj)
-        {
-            Utility.Code.Require(obj, "obj");
-
-            return obj.FullyQualifiedName.GetHashCode() ^ obj.Source.GetHashCode();
-        }
-
-        #endregion IEqualityComparer<TestCase>
-    }
+// (C) Copyright ETAS 2015.
+// 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)
+
+using System.Collections.Generic;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
+
+namespace BoostTestAdapter.Utility.VisualStudio
+{
+    /// <summary>
+    /// An ITestCaseDiscoverySink implementation. Aggregates all tests
+    /// within an internal collection which is publicly accessible.
+    /// </summary>
+    public class DefaultTestCaseDiscoverySink : ITestCaseDiscoverySink
+    {
+        private ICollection<TestCase> _tests = new HashSet<TestCase>(new TestCaseComparer());
+
+        /// <summary>
+        /// The collection of discovered TestCases
+        /// </summary>
+        public IEnumerable<TestCase> Tests
+        {
+            get
+            {
+                return _tests;
+            }
+        }
+
+        #region ITestCaseDiscoverySink
+
+        public void SendTestCase(TestCase discoveredTest)
+        {
+            this._tests.Add(discoveredTest);
+        }
+
+        #endregion ITestCaseDiscoverySink
+    }
+    
+    /// <summary>
+    /// TestCase equality comparer which defines equality based on the TestCase's
+    /// Fully Qualified Name.
+    /// </summary>
+    public class TestCaseComparer : IEqualityComparer<TestCase>
+    {
+        #region IEqualityComparer<TestCase>
+
+        public bool Equals(TestCase x, TestCase y)
+        {
+            Utility.Code.Require(x, "x");
+            Utility.Code.Require(y, "y");
+
+            return (x.FullyQualifiedName == y.FullyQualifiedName) && (x.Source == y.Source);
+        }
+
+        public int GetHashCode(TestCase obj)
+        {
+            Utility.Code.Require(obj, "obj");
+
+            return obj.FullyQualifiedName.GetHashCode() ^ obj.Source.GetHashCode();
+        }
+
+        #endregion IEqualityComparer<TestCase>
+    }
 }
\ No newline at end of file
diff --git a/BoostTestAdapterNunit/BoostDataTestCaseVerifierTest.cs b/BoostTestAdapterNunit/BoostDataTestCaseVerifierTest.cs
new file mode 100644
index 0000000..96cd91f
--- /dev/null
+++ b/BoostTestAdapterNunit/BoostDataTestCaseVerifierTest.cs
@@ -0,0 +1,139 @@
+// (C) Copyright ETAS 2015.
+// 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)
+
+using NUnit.Framework;
+
+using BoostTestAdapter.Boost.Test;
+using BoostTestAdapter.Utility;
+
+using BoostTestAdapterNunit.Utility;
+
+namespace BoostTestAdapterNunit
+{
+    [TestFixture]
+    internal class BoostDataTestCaseVerifierTest
+    {
+        private const string _sourceFile = @"c:\test.cpp";
+
+        /// <summary>
+        /// Creates a 'default' TestFrameworkBuilder instance for this TestFixture
+        /// </summary>
+        /// <returns>A 'default' TestFrameworkBuilder instance</returns>
+        private static TestFrameworkBuilder CreateFrameworkBuilder()
+        {
+            return new TestFrameworkBuilder("test.exe", "MyTest", 1);
+        }
+
+        /// <summary>
+        /// Locates the test suite with the provided fully qualified name
+        /// </summary>
+        /// <param name="framework">The framework from which to locate the test suite</param>
+        /// <param name="fullyQualifiedName">The test suite's fully qualified name</param>
+        /// <returns>The test suite which was located or null if it was not found</returns>
+        private static TestSuite LocateSuite(TestFramework framework, string fullyQualifiedName)
+        {
+            var suite = BoostTestLocator.Locate(framework, fullyQualifiedName);
+
+            Assert.That(suite, Is.Not.Null);
+            Assert.That(suite, Is.TypeOf<TestSuite>());
+
+            return (TestSuite) suite;
+        }
+
+        /// <summary>
+        /// Verifies if the test suite with the specified fully qualified name is a BOOST_DATA_TEST_CASE
+        /// </summary>
+        /// <param name="framework">The framework from which to locate the test suite</param>
+        /// <param name="fullyQualifiedName">The test suite's fully qualified name</param>
+        /// <returns>true if the test suite is a BOOST_DATA_TEST_CASE; false otherwise</returns>
+        private static bool IsBoostDataTestCase(TestFramework framework, string fullyQualifiedName)
+        {
+            var suite = LocateSuite(framework, fullyQualifiedName);
+            return (suite != null) && (BoostDataTestCaseVerifier.IsBoostDataTestCase(suite));
+        }
+
+        /// <summary>
+        /// Assert that: A valid BOOST_DATA_TEST_CASE can be identified as such
+        /// </summary>
+        [Test]
+        public void ValidBoostDataTestCase()
+        {
+            TestFramework framework = CreateFrameworkBuilder().
+                TestSuite("DataTestCase", 2, new SourceFileInfo(_sourceFile, 10)).
+                    TestCase("_0", 65536, new SourceFileInfo(_sourceFile, 10)).
+                    TestCase("_1", 65537, new SourceFileInfo(_sourceFile, 10)).
+                    TestCase("_2", 65538, new SourceFileInfo(_sourceFile, 10)).
+                    TestCase("_3", 65539, new SourceFileInfo(_sourceFile, 10)).
+                EndSuite().
+                Build();
+
+            bool result = IsBoostDataTestCase(framework, "DataTestCase");
+            Assert.That(result, Is.True);
+        }
+
+        /// <summary>
+        /// Assert that: A test suite containing tests with a pattern similar to BOOST_DATA_TEST_CASE is not identified
+        ///              as a data test case instance if the line numbers differ from the parent test suite instance
+        /// </summary>
+        [Test]
+        public void FakeBoostDataTestCase()
+        {
+            TestFramework framework = CreateFrameworkBuilder().
+                TestSuite("BoostUnitTest", 2, new SourceFileInfo(_sourceFile, 10)).
+                    TestCase("_0", 65536, new SourceFileInfo(_sourceFile, 13)).
+                    TestCase("_1", 65537, new SourceFileInfo(_sourceFile, 23)).
+                    TestCase("_2", 65538, new SourceFileInfo(_sourceFile, 33)).
+                    TestCase("_3", 65539, new SourceFileInfo(_sourceFile, 43)).
+                EndSuite().
+                Build();
+
+            bool result = IsBoostDataTestCase(framework, "BoostUnitTest");
+            Assert.That(result, Is.False);
+        }
+
+        /// <summary>
+        /// Assert that: A regular test suite containing test suites and test cases is not identified as a 
+        ///              BOOST_DATA_TEST_CASE
+        /// </summary>
+        [Test]
+        public void RegularTestSuite()
+        {
+            TestFramework framework = CreateFrameworkBuilder().
+                TestSuite("Suite1", 2, new SourceFileInfo(_sourceFile, 10)).
+                    TestSuite("Suite2", 3, new SourceFileInfo(_sourceFile, 15)).
+                        TestCase("Test1", 65536, new SourceFileInfo(_sourceFile, 23)).
+                    EndSuite().
+                EndSuite().
+                Build();
+
+            {
+                bool result = IsBoostDataTestCase(framework, "Suite1");
+                Assert.That(result, Is.False);
+            }
+
+            {
+                bool result = IsBoostDataTestCase(framework, "Suite1/Suite2");
+                Assert.That(result, Is.False);
+            }
+        }
+
+        /// <summary>
+        /// Assert that: A regular test suite containing solely test cases is not identified as a 
+        ///              BOOST_DATA_TEST_CASE
+        /// </summary>
+        [Test]
+        public void RegularTestCase()
+        {
+            TestFramework framework = CreateFrameworkBuilder().
+                TestSuite("Suite1", 2, new SourceFileInfo(_sourceFile, 10)).
+                    TestCase("Test1", 65536, new SourceFileInfo(_sourceFile, 23)).
+                EndSuite().
+                Build();
+
+            bool result = IsBoostDataTestCase(framework, "Suite1");
+            Assert.That(result, Is.False);
+        }
+    }
+}
diff --git a/BoostTestAdapterNunit/BoostTestAdapterNunit.csproj b/BoostTestAdapterNunit/BoostTestAdapterNunit.csproj
index 0f13538..16808bb 100644
--- a/BoostTestAdapterNunit/BoostTestAdapterNunit.csproj
+++ b/BoostTestAdapterNunit/BoostTestAdapterNunit.csproj
@@ -1,182 +1,186 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{FE58A67C-D313-46FD-B8F3-F80383EE5FD1}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>BoostTestAdapterNunit</RootNamespace>
-    <AssemblyName>BoostTestAdapterNunit</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <RunCodeAnalysis>true</RunCodeAnalysis>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup>
-    <!--MSBuild 4.0 property-->
-    <ProgramFiles32>$(MSBuildProgramFiles32)</ProgramFiles32>
-    <!--Use OS env var as a fallback:- 32 bit MSBuild 2.0/3.5 on x64 will use this-->
-    <ProgramFiles32 Condition=" '' == '$(ProgramFiles32)'">$(ProgramFiles%28x86%29)</ProgramFiles32>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{FE58A67C-D313-46FD-B8F3-F80383EE5FD1}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>BoostTestAdapterNunit</RootNamespace>
+    <AssemblyName>BoostTestAdapterNunit</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <RunCodeAnalysis>true</RunCodeAnalysis>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup>
+    <!--MSBuild 4.0 property-->
+    <ProgramFiles32>$(MSBuildProgramFiles32)</ProgramFiles32>
+    <!--Use OS env var as a fallback:- 32 bit MSBuild 2.0/3.5 on x64 will use this-->
+    <ProgramFiles32 Condition=" '' == '$(ProgramFiles32)'">$(ProgramFiles%28x86%29)</ProgramFiles32>
     <!-- Handle MSBuild 2.0/3.5 running in 64 bit mode - neither of the above env vars are available. http://stackoverflow.com/questions/336633
-    NB this trick (Adding a literal " (x86)" to the 64 bit Program Files path) may or may not work on all versions/locales of Windows -->
-    <ProgramFiles32 Condition="'$(ProgramFiles32)'=='' AND 'AMD64' == '$(PROCESSOR_ARCHITECTURE)'">$(ProgramFiles) (x86)</ProgramFiles32>
-    <!--Catch-all - handles .NET 2.0/3.5 non-AMD64 and .NET 2.0 on x86 -->
-    <ProgramFiles32 Condition=" '' == '$(ProgramFiles32)' ">$(ProgramFiles)</ProgramFiles32>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Antlr4.Runtime">
-      <HintPath>..\Antlr.DOT\lib\Antlr4.Runtime.dll</HintPath>
-    </Reference>
-    <Reference Include="FakeItEasy">
-      <HintPath>..\packages\FakeItEasy.1.13.1\lib\net40\FakeItEasy.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.VisualStudio.TestPlatform.ObjectModel, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>$(ProgramFiles32)\Microsoft Visual Studio 14.0\Common7\IDE\CommonExtensions\Microsoft\TestWindow\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll</HintPath>
-    </Reference>
-    <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.XML" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="BoostTestDiscovererFactoryTest.cs" />
-    <Compile Include="BoostTestDiscovererTest.cs" />
-    <Compile Include="BoostTestExecutorTest.cs" />
-    <Compile Include="BoostTestResultTest.cs" />
-    <Compile Include="BoostTestRunnerCommandLineArgsTest.cs" />
-    <Compile Include="BoostTestSettingsTest.cs" />
-    <Compile Include="BoostTestTest.cs" />
-    <Compile Include="CommandEvaluatorTest.cs" />
-    <Compile Include="CorrectReferencedAssembliesTest.cs" />
-    <Compile Include="DefaultBoostTestRunnerFactoryTest.cs" />
-    <Compile Include="DefaultTestDiscovererFactoryTest.cs" />
-    <Compile Include="Fakes\StubBoostTestRunnerFactory.cs" />
-    <Compile Include="ListContentDiscovererTest.cs" />
-    <Compile Include="DOTDeserialisationTest.cs" />
-    <Compile Include="Fakes\ConsoleMessageLogger.cs" />
-    <Compile Include="Fakes\DefaultTestContext.cs" />
-    <Compile Include="LoggerTest.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="TestSourceFilterTest.cs" />
-    <Compile Include="Fakes\DummySolution.cs" />
-    <Compile Include="Fakes\DummyVSProvider.cs" />
-    <Compile Include="Utility\FrameworkEqualityVisitor.cs" />
-    <Compile Include="Utility\TestHelper.cs" />
-    <Compile Include="Utility\VisualStudioInstanceBuilders.cs" />
-    <Compile Include="VSTestModelTest.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Antlr.DOT\Antlr.DOT.csproj">
-      <Project>{488ae1ce-107d-4f5b-9f1f-ed7905d5ce75}</Project>
-      <Name>Antlr.DOT</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\BoostTestAdapter\BoostTestAdapter.csproj">
-      <Project>{bc4b3bed-9241-4dd6-8070-a9b66dfc08c1}</Project>
-      <Name>BoostTestAdapter</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\VisualStudioAdapter\VisualStudioAdapter.csproj">
-      <Project>{62347cc7-c839-413d-a7ce-598409f6f15b}</Project>
-      <Name>VisualStudioAdapter</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-    <EmbeddedResource Include="Resources\Log4NetConfigFile\BoostTestAdapter.dll.config" />
-    <EmbeddedResource Include="Resources\ReportsLogs\MemoryLeakTest\sample.NoSourceFileAndLineNumbersAvailable.test.stdout.log" />
-    <EmbeddedResource Include="Resources\ReportsLogs\MemoryLeakTest\sample.SourceFileAndLineNumbersAvailable.test.stdout.log" />
-    <EmbeddedResource Include="Resources\ReportsLogs\OutputTest\sample.test.stderr.log" />
-    <EmbeddedResource Include="Resources\ReportsLogs\OutputTest\sample.test.stdout.log" />
-    <EmbeddedResource Include="Resources\Settings\default.runsettings" />
-    <EmbeddedResource Include="Resources\Settings\empty.runsettings" />
-    <EmbeddedResource Include="Resources\Settings\sample.2.runsettings" />
-    <EmbeddedResource Include="Resources\Settings\sample.runsettings" />
-    <EmbeddedResource Include="Resources\Settings\externalTestRunner.runsettings" />
-    <EmbeddedResource Include="Resources\ReportsLogs\GlobalFixtureError\sample.test.stderr.log" />
-    <EmbeddedResource Include="Resources\ReportsLogs\GlobalFixtureError\sample.test.stdout.log" />
-    <EmbeddedResource Include="Resources\ReportsLogs\Empty\sample.test.stderr.log" />
-    <EmbeddedResource Include="Resources\ReportsLogs\Empty\sample.test.stdout.log" />
-    <EmbeddedResource Include="Resources\ListContentDOT\sample.3.list.content.gv" />
-    <EmbeddedResource Include="Resources\ListContentDOT\sample.list.content.gv" />
-    <EmbeddedResource Include="Resources\ListContentDOT\sample.8.list.content.gv" />
-    <EmbeddedResource Include="Resources\ReportsLogs\MemoryLeakTest\sample.test.stderr.log" />
-    <EmbeddedResource Include="Resources\ListContentDOT\test_list_content.gv" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Resources\ReportsLogs\AbortedTest\sample.test.log.xml" />
-    <EmbeddedResource Include="Resources\ReportsLogs\AbortedTest\sample.test.report.xml" />
-    <EmbeddedResource Include="Resources\ReportsLogs\BoostFailTest\sample.test.log.xml" />
-    <EmbeddedResource Include="Resources\ReportsLogs\BoostFailTest\sample.test.report.xml" />
-    <EmbeddedResource Include="Resources\ReportsLogs\FailedRequireTest\sample.test.log.xml" />
-    <EmbeddedResource Include="Resources\ReportsLogs\FailedRequireTest\sample.test.report.xml" />
-    <EmbeddedResource Include="Resources\ReportsLogs\MemoryLeakTest\sample.test.log.xml" />
-    <EmbeddedResource Include="Resources\ReportsLogs\MemoryLeakTest\sample.test.report.xml" />
-    <EmbeddedResource Include="Resources\ReportsLogs\MultipleTests\sample.test.log.xml" />
-    <EmbeddedResource Include="Resources\ReportsLogs\MultipleTests\sample.test.report.xml" />
-    <EmbeddedResource Include="Resources\ReportsLogs\NestedTestSuite\sample.test.log.xml" />
-    <EmbeddedResource Include="Resources\ReportsLogs\NestedTestSuite\sample.test.report.xml" />
-    <EmbeddedResource Include="Resources\ReportsLogs\NoMatchingTests\sample.test.log.xml" />
-    <EmbeddedResource Include="Resources\ReportsLogs\NoMatchingTests\sample.test.report.xml" />
-    <EmbeddedResource Include="Resources\ReportsLogs\OutputTest\sample.test.report.xml" />
-    <EmbeddedResource Include="Resources\ReportsLogs\PassedTest\sample.test.log.xml" />
-    <EmbeddedResource Include="Resources\ReportsLogs\PassedTest\sample.test.report.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Resources\ReportsLogs\SpecialCharacters\sample.test.log.xml" />
-    <EmbeddedResource Include="Resources\ReportsLogs\SpecialCharacters\sample.test.report.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Resources\ReportsLogs\ControlCharacters\sample.test.log.xml" />
-    <EmbeddedResource Include="Resources\ReportsLogs\ControlCharacters\sample.test.report.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Resources\ReportsLogs\InvalidXmlLog\test_hlp.exe.test.log.xml" />
-    <EmbeddedResource Include="Resources\ReportsLogs\InvalidXmlLog\test_hlp.exe.test.report.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Resources\ReportsLogs\GlobalFixtureError\sample.test.log.xml" />
-    <EmbeddedResource Include="Resources\ReportsLogs\GlobalFixtureError\sample.test.report.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Resources\ReportsLogs\Empty\sample.test.log.xml" />
-    <EmbeddedResource Include="Resources\ReportsLogs\Empty\sample.test.report.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Resources\ReportsLogs\TestContext\ExampleBoostUnittest.exe.test.log.xml" />
-    <EmbeddedResource Include="Resources\ReportsLogs\TestContext\ExampleBoostUnittest.exe.test.report.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Resources\ReportsLogs\DataTestCase\sample.test.report.xml" />
-    <EmbeddedResource Include="Resources\ReportsLogs\DataTestCase\sample.test.log.xml" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+    NB this trick (Adding a literal " (x86)" to the 64 bit Program Files path) may or may not work on all versions/locales of Windows -->
+    <ProgramFiles32 Condition="'$(ProgramFiles32)'=='' AND 'AMD64' == '$(PROCESSOR_ARCHITECTURE)'">$(ProgramFiles) (x86)</ProgramFiles32>
+    <!--Catch-all - handles .NET 2.0/3.5 non-AMD64 and .NET 2.0 on x86 -->
+    <ProgramFiles32 Condition=" '' == '$(ProgramFiles32)' ">$(ProgramFiles)</ProgramFiles32>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Antlr4.Runtime">
+      <HintPath>..\Antlr.DOT\lib\Antlr4.Runtime.dll</HintPath>
+    </Reference>
+    <Reference Include="FakeItEasy">
+      <HintPath>..\packages\FakeItEasy.1.13.1\lib\net40\FakeItEasy.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.TestPlatform.ObjectModel, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>$(ProgramFiles32)\Microsoft Visual Studio 14.0\Common7\IDE\CommonExtensions\Microsoft\TestWindow\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll</HintPath>
+    </Reference>
+    <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.XML" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="BoostDataTestCaseVerifierTest.cs" />
+    <Compile Include="BoostTestDiscovererFactoryTest.cs" />
+    <Compile Include="BoostTestDiscovererTest.cs" />
+    <Compile Include="BoostTestExecutorTest.cs" />
+    <Compile Include="BoostTestResultTest.cs" />
+    <Compile Include="BoostTestRunnerCommandLineArgsTest.cs" />
+    <Compile Include="BoostTestSettingsTest.cs" />
+    <Compile Include="BoostTestTest.cs" />
+    <Compile Include="CommandEvaluatorTest.cs" />
+    <Compile Include="CorrectReferencedAssembliesTest.cs" />
+    <Compile Include="DefaultBoostTestRunnerFactoryTest.cs" />
+    <Compile Include="DefaultTestDiscovererFactoryTest.cs" />
+    <Compile Include="Fakes\StubBoostTestRunnerFactory.cs" />
+    <Compile Include="ListContentDiscovererTest.cs" />
+    <Compile Include="DOTDeserialisationTest.cs" />
+    <Compile Include="Fakes\ConsoleMessageLogger.cs" />
+    <Compile Include="Fakes\DefaultTestContext.cs" />
+    <Compile Include="LoggerTest.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="TestSourceFilterTest.cs" />
+    <Compile Include="Fakes\DummySolution.cs" />
+    <Compile Include="Fakes\DummyVSProvider.cs" />
+    <Compile Include="Utility\BoostTestLocator.cs" />
+    <Compile Include="Utility\FrameworkEqualityVisitor.cs" />
+    <Compile Include="Utility\TestHelper.cs" />
+    <Compile Include="Utility\VisualStudioInstanceBuilders.cs" />
+    <Compile Include="VSDiscoveryVisitorTest.cs" />
+    <Compile Include="VSTestModelTest.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Antlr.DOT\Antlr.DOT.csproj">
+      <Project>{488ae1ce-107d-4f5b-9f1f-ed7905d5ce75}</Project>
+      <Name>Antlr.DOT</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\BoostTestAdapter\BoostTestAdapter.csproj">
+      <Project>{bc4b3bed-9241-4dd6-8070-a9b66dfc08c1}</Project>
+      <Name>BoostTestAdapter</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\VisualStudioAdapter\VisualStudioAdapter.csproj">
+      <Project>{62347cc7-c839-413d-a7ce-598409f6f15b}</Project>
+      <Name>VisualStudioAdapter</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+    <EmbeddedResource Include="Resources\Log4NetConfigFile\BoostTestAdapter.dll.config" />
+    <EmbeddedResource Include="Resources\ReportsLogs\MemoryLeakTest\sample.NoSourceFileAndLineNumbersAvailable.test.stdout.log" />
+    <EmbeddedResource Include="Resources\ReportsLogs\MemoryLeakTest\sample.SourceFileAndLineNumbersAvailable.test.stdout.log" />
+    <EmbeddedResource Include="Resources\ReportsLogs\OutputTest\sample.test.stderr.log" />
+    <EmbeddedResource Include="Resources\ReportsLogs\OutputTest\sample.test.stdout.log" />
+    <EmbeddedResource Include="Resources\Settings\default.runsettings" />
+    <EmbeddedResource Include="Resources\Settings\empty.runsettings" />
+    <EmbeddedResource Include="Resources\Settings\sample.2.runsettings" />
+    <EmbeddedResource Include="Resources\Settings\sample.runsettings" />
+    <EmbeddedResource Include="Resources\Settings\externalTestRunner.runsettings" />
+    <EmbeddedResource Include="Resources\ReportsLogs\GlobalFixtureError\sample.test.stderr.log" />
+    <EmbeddedResource Include="Resources\ReportsLogs\GlobalFixtureError\sample.test.stdout.log" />
+    <EmbeddedResource Include="Resources\ReportsLogs\Empty\sample.test.stderr.log" />
+    <EmbeddedResource Include="Resources\ReportsLogs\Empty\sample.test.stdout.log" />
+    <EmbeddedResource Include="Resources\ListContentDOT\sample.3.list.content.gv" />
+    <EmbeddedResource Include="Resources\ListContentDOT\sample.list.content.gv" />
+    <EmbeddedResource Include="Resources\ListContentDOT\sample.8.list.content.gv" />
+    <EmbeddedResource Include="Resources\ReportsLogs\MemoryLeakTest\sample.test.stderr.log" />
+    <EmbeddedResource Include="Resources\ListContentDOT\test_list_content.gv" />
+    <EmbeddedResource Include="Resources\ListContentDOT\boost_data_test_case.gv" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\ReportsLogs\AbortedTest\sample.test.log.xml" />
+    <EmbeddedResource Include="Resources\ReportsLogs\AbortedTest\sample.test.report.xml" />
+    <EmbeddedResource Include="Resources\ReportsLogs\BoostFailTest\sample.test.log.xml" />
+    <EmbeddedResource Include="Resources\ReportsLogs\BoostFailTest\sample.test.report.xml" />
+    <EmbeddedResource Include="Resources\ReportsLogs\FailedRequireTest\sample.test.log.xml" />
+    <EmbeddedResource Include="Resources\ReportsLogs\FailedRequireTest\sample.test.report.xml" />
+    <EmbeddedResource Include="Resources\ReportsLogs\MemoryLeakTest\sample.test.log.xml" />
+    <EmbeddedResource Include="Resources\ReportsLogs\MemoryLeakTest\sample.test.report.xml" />
+    <EmbeddedResource Include="Resources\ReportsLogs\MultipleTests\sample.test.log.xml" />
+    <EmbeddedResource Include="Resources\ReportsLogs\MultipleTests\sample.test.report.xml" />
+    <EmbeddedResource Include="Resources\ReportsLogs\NestedTestSuite\sample.test.log.xml" />
+    <EmbeddedResource Include="Resources\ReportsLogs\NestedTestSuite\sample.test.report.xml" />
+    <EmbeddedResource Include="Resources\ReportsLogs\NoMatchingTests\sample.test.log.xml" />
+    <EmbeddedResource Include="Resources\ReportsLogs\NoMatchingTests\sample.test.report.xml" />
+    <EmbeddedResource Include="Resources\ReportsLogs\OutputTest\sample.test.report.xml" />
+    <EmbeddedResource Include="Resources\ReportsLogs\PassedTest\sample.test.log.xml" />
+    <EmbeddedResource Include="Resources\ReportsLogs\PassedTest\sample.test.report.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\ReportsLogs\SpecialCharacters\sample.test.log.xml" />
+    <EmbeddedResource Include="Resources\ReportsLogs\SpecialCharacters\sample.test.report.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\ReportsLogs\ControlCharacters\sample.test.log.xml" />
+    <EmbeddedResource Include="Resources\ReportsLogs\ControlCharacters\sample.test.report.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\ReportsLogs\InvalidXmlLog\test_hlp.exe.test.log.xml" />
+    <EmbeddedResource Include="Resources\ReportsLogs\InvalidXmlLog\test_hlp.exe.test.report.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\ReportsLogs\GlobalFixtureError\sample.test.log.xml" />
+    <EmbeddedResource Include="Resources\ReportsLogs\GlobalFixtureError\sample.test.report.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\ReportsLogs\Empty\sample.test.log.xml" />
+    <EmbeddedResource Include="Resources\ReportsLogs\Empty\sample.test.report.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\ReportsLogs\TestContext\ExampleBoostUnittest.exe.test.log.xml" />
+    <EmbeddedResource Include="Resources\ReportsLogs\TestContext\ExampleBoostUnittest.exe.test.report.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\ReportsLogs\DataTestCase\sample.test.report.xml" />
+    <EmbeddedResource Include="Resources\ReportsLogs\DataTestCase\sample.test.log.xml" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
   </Target>
   <Target Name="AfterBuild">
   </Target>
-  -->
+  -->
 </Project>
\ No newline at end of file
diff --git a/BoostTestAdapterNunit/BoostTestExecutorTest.cs b/BoostTestAdapterNunit/BoostTestExecutorTest.cs
index 237630b..6d5ec92 100644
--- a/BoostTestAdapterNunit/BoostTestExecutorTest.cs
+++ b/BoostTestAdapterNunit/BoostTestExecutorTest.cs
@@ -466,7 +466,11 @@ private VSTestCase CreateTestCase(string fullyQualifiedName, string source)
         {
             VSTestCase test = new VSTestCase(fullyQualifiedName, BoostTestExecutor.ExecutorUri, source);
 
-            test.Traits.Add(VSTestModel.TestSuiteTrait, QualifiedNameBuilder.FromString(fullyQualifiedName).Pop().ToString());
+            var fullyQualifiedNameBuilder = QualifiedNameBuilder.FromString(fullyQualifiedName);
+
+            test.DisplayName = fullyQualifiedNameBuilder.Peek();
+
+            test.Traits.Add(VSTestModel.TestSuiteTrait, fullyQualifiedNameBuilder.Pop().ToString());
             test.Traits.Add(VSTestModel.StatusTrait, VSTestModel.TestEnabled);
 
             return test;
@@ -972,7 +976,7 @@ public void TestTestSuiteBatchedRuns()
             
             List<KeyValuePair<string, IList<string>>> expectedBatches = new List<KeyValuePair<string, IList<string>>>
             {
-                new KeyValuePair<string, IList<string>>(DefaultSource, new List<string> {"A/Test1", "A/Test2"}),
+                new KeyValuePair<string, IList<string>>(DefaultSource, new List<string> {"A/Test1", "Test2"}),
                 new KeyValuePair<string, IList<string>>(DefaultSource, new List<string> {"B/Test1"}),
                 new KeyValuePair<string, IList<string>>(otherSource, new List<string> {"A/Test1"})
             };
diff --git a/BoostTestAdapterNunit/BoostTestTest.cs b/BoostTestAdapterNunit/BoostTestTest.cs
index cecf636..389287e 100644
--- a/BoostTestAdapterNunit/BoostTestTest.cs
+++ b/BoostTestAdapterNunit/BoostTestTest.cs
@@ -4,14 +4,11 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 
 using System;
-using System.IO;
-using System.Xml;
-using System.Xml.Serialization;
 using BoostTestAdapter.Boost.Test;
 using BoostTestAdapter.Utility;
-using BoostTestAdapterNunit.Utility;
 using NUnit.Framework;
-
+using BoostTestAdapterNunit.Utility;
+
 namespace BoostTestAdapterNunit
 {
     [TestFixture]
@@ -25,57 +22,7 @@ class BoostTestTest
         private const string Source = @"C:\tests.dll";
 
         #endregion Test Data
-
-        #region Helper Classes
         
-        /// <summary>
-        /// ITestVisitor implementation which looks up test units based on their qualified name.
-        /// </summary>
-        private class TestUnitLookup : ITestVisitor
-        {
-            public TestUnitLookup(string fullyQualifiedName)
-            {
-                this.FullyQualifiedName = fullyQualifiedName;
-            }
-
-            public string FullyQualifiedName { get; private set; }
-            public TestUnit Unit { get; private set; }
-
-            public void Visit(TestCase testCase)
-            {
-                Check(testCase);
-            }
-
-            public void Visit(TestSuite testSuite)
-            {
-                if (!Check(testSuite))
-                {
-                    foreach (TestUnit child in testSuite.Children)
-                    {
-                        child.Apply(this);
-                        if (this.Unit != null)
-                        {
-                            break;
-                        }
-                    }
-                }
-            }
-
-            private bool Check(TestUnit unit)
-            {
-                bool match = (unit.FullyQualifiedName == this.FullyQualifiedName);
-
-                if (match)
-                {
-                    this.Unit = unit;
-                }
-
-                return match;
-            }
-        }
-
-        #endregion Helper Classes
-
         #region Helper Methods
         
         /// <summary>
@@ -86,9 +33,7 @@ private bool Check(TestUnit unit)
         /// <returns>The test unit with the requested fully qualified name or null if it cannot be found</returns>
         private TestUnit Lookup(TestUnit root, string fullyQualifiedName)
         {
-            TestUnitLookup lookup = new TestUnitLookup(fullyQualifiedName);
-            root.Apply(lookup);
-            return lookup.Unit;
+            return BoostTestLocator.Locate(root, fullyQualifiedName);
         }
         
         /// <summary>
diff --git a/BoostTestAdapterNunit/DOTDeserialisationTest.cs b/BoostTestAdapterNunit/DOTDeserialisationTest.cs
index 86adc6f..b429ae6 100644
--- a/BoostTestAdapterNunit/DOTDeserialisationTest.cs
+++ b/BoostTestAdapterNunit/DOTDeserialisationTest.cs
@@ -1,160 +1,177 @@
-// (C) Copyright ETAS 2015.
-// 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)
-
-using BoostTestAdapter.Utility;
-using BoostTestAdapter.Boost.Test;
-
-using BoostTestAdapterNunit.Utility;
-
-using NUnit.Framework;
-
-namespace BoostTestAdapterNunit
-{
-    [TestFixture]
-    public class DOTDeserialisationTest
-    {
-        #region Test Data
-
-        /// <summary>
-        /// Default source identifier for test purposes
-        /// </summary>
-        private static string Source
-        {
-            get
-            {
-                return "source.exe";
-            }
-        }
-
-        #endregion Test Data
-
-        #region Helper Methods
-
-        /// <summary>
-        /// Compares a test framework deserialised from the provided embedded resource against the expected one
-        /// </summary>
-        /// <param name="resource">Path to an embedded resource which is to be treated as input for TestFramework deserialisation</param>
-        /// <param name="expected">The TestFramework which the deserialised version should be compared against</param>
-        private void Compare(string resource, TestFramework expected)
-        {
-            using (var stream = TestHelper.LoadEmbeddedResource(resource))
-            {
-                TestFrameworkDOTDeserialiser parser = new TestFrameworkDOTDeserialiser(Source);
-                TestFramework framework = parser.Deserialise(stream);
-
-                FrameworkEqualityVisitor.IsEqualTo(framework, expected, false);
-            }
-        }
-
-        #endregion Helper Methods
-
-        /// <summary>
-        /// Deserialisation of (relatively large) Boost Test DOT content containing most features
-        /// 
-        /// Test aims:
-        ///     - Ensure that a TestFramework can be deserialised correctly from DOT content
-        /// </summary>
-        [Test]
-        public void DeserialiseDOT()
-        {
-            TestFramework expected = new TestFrameworkBuilder(Source, "sample", 1, false).
-                TestSuite("suite_1", 2, new SourceFileInfo(@"d:\sample.boostunittest\file_1.cpp", 6), false).
-                    TestSuite("suite_2", 3, new SourceFileInfo(@"d:\sample.boostunittest\file_1.cpp", 8), false).
-                        TestCase("test_3", 65536, new SourceFileInfo(@"d:\sample.boostunittest\file_1.cpp", 14), null, false).
-                        TestCase("test_4", 65537, new SourceFileInfo(@"d:\sample.boostunittest\file_1.cpp", 44), null, false).
-                        TestCase("test_5", 65538, new SourceFileInfo(@"d:\sample.boostunittest\file_1.cpp", 62), null, false).
-                    EndSuite().
-                    TestSuite("suite_6", 4, new SourceFileInfo(@"d:\sample.boostunittest\file_2.cpp", 19), false).
-                        TestCase("test_7", 65539, new SourceFileInfo(@"d:\sample.boostunittest\file_2.cpp", 24), null, false).
-                        TestCase("test_8", 65540, new SourceFileInfo(@"d:\sample.boostunittest\file_2.cpp", 40), null, false).
-                        TestCase("test_9", 65541, new SourceFileInfo(@"d:\sample.boostunittest\file_2.cpp", 90), null, false).
-                        TestCase("test_10", 65542, new SourceFileInfo(@"d:\sample.boostunittest\file_2.cpp", 105), null, false).
-                        TestCase("test_11", 65543, new SourceFileInfo(@"d:\sample.boostunittest\file_2.cpp", 121), null, false).
-                        TestCase("test_12", 65544, new SourceFileInfo(@"d:\sample.boostunittest\file_2.cpp", 134), null, false).
-                        TestCase("test_13", 65545, new SourceFileInfo(@"d:\sample.boostunittest\file_2.cpp", 310), null, false).
-                    EndSuite().
-                    TestSuite("suite_14", 5, new SourceFileInfo(@"d:\sample.boostunittest\file_3.cpp", 20), false).
-                        TestCase("test_15", 65546, new SourceFileInfo(@"d:\sample.boostunittest\file_3.cpp", 27), null, false).
-                        TestCase("test_16", 65547, new SourceFileInfo(@"d:\sample.boostunittest\file_3.cpp", 49), null, false).
-                        TestCase("test_17", 65548, new SourceFileInfo(@"d:\sample.boostunittest\file_3.cpp", 59), null, false).
-                        TestCase("test_18", 65549, new SourceFileInfo(@"d:\sample.boostunittest\file_3.cpp", 88), null, false).
-                    EndSuite().
-                    TestSuite("suite_19", 6, new SourceFileInfo(@"d:\sample.boostunittest\file_4.cpp", 7), false).
-                        TestCase("test_20", 65550, new SourceFileInfo(@"d:\sample.boostunittest\file_4.cpp", 12), null, false).
-                    EndSuite().
-                    TestSuite("suite_21", 7, new SourceFileInfo(@"d:\sample.boostunittest\file_5.cpp", 8), false).
-                        TestCase("test_22", 65551, new SourceFileInfo(@"d:\sample.boostunittest\file_5.cpp", 14), null, false).
-                    EndSuite().
-                    TestSuite("suite_23", 8, new SourceFileInfo(@"d:\sample.boostunittest\file_6.cpp", 13), false).
-                        TestCase("test_24", 65552, new SourceFileInfo(@"d:\sample.boostunittest\file_6.cpp", 18), null, false).
-                        TestCase("test_25", 65553, new SourceFileInfo(@"d:\sample.boostunittest\file_6.cpp", 28), null, false).
-                        TestCase("test_26", 65554, new SourceFileInfo(@"d:\sample.boostunittest\file_6.cpp", 38), null, false).
-                        TestCase("test_27", 65555, new SourceFileInfo(@"d:\sample.boostunittest\file_6.cpp", 48), null, false).
-                        TestCase("test_28", 65556, new SourceFileInfo(@"d:\sample.boostunittest\file_6.cpp", 59), null, false).
-                        TestCase("test_29", 65557, new SourceFileInfo(@"d:\sample.boostunittest\file_6.cpp", 70), null, false).
-                    EndSuite().
-                    TestSuite("suite_30", 9, new SourceFileInfo(@"d:\sample.boostunittest\file_7.cpp", 8), false).
-                        TestCase("test_31", 65558, new SourceFileInfo(@"d:\sample.boostunittest\file_7.cpp", 14), new[] { "hello", "world", "labels" }, false).
-                    EndSuite().
-                EndSuite().
-            Build();
-
-            Compare("BoostTestAdapterNunit.Resources.ListContentDOT.sample.list.content.gv", expected);
-        }
-
-        /// <summary>
-        /// Deserialisation of Boost Test DOT content consisting of the following scenario:
-        /// 
-        /// - Master Test Suite
-        /// -- Test Case
-        /// -- Test Suite
-        /// --- Test Case
-        /// -- Test Case
-        /// 
-        /// Test aims:
-        ///     - Ensure that a TestFramework can be deserialised correctly from DOT content
-        /// </summary>
-        [Test]
-        public void TestSuiteWithChildTestsAndSuites()
-        {
-            TestFramework expected = new TestFrameworkBuilder(Source, "MyTest", 1, false).
-                TestCase("Test", 65536, new SourceFileInfo(@"c:\boostunittest\boostunittestsample.cpp", 30),null, false).
-                TestSuite("Suite", 2, new SourceFileInfo(@"c:\boostunittest\boostunittestsample.cpp", 35), false).
-                    TestCase("Test", 65537, new SourceFileInfo(@"c:\boostunittest\boostunittestsample.cpp", 37), null, false).
-                EndSuite().
-                TestCase("TestB", 65538, new SourceFileInfo(@"c:\boostunittest\boostunittestsample.cpp", 44), null, false).
-            Build();
-
-            Compare("BoostTestAdapterNunit.Resources.ListContentDOT.sample.3.list.content.gv", expected);
-        }
-
-        
-        /// <summary>
-        /// Deserialisation of Boost Test DOT content consisting of test cases which are
-        /// explicitly enabled or disabled using boost decorators
-        /// 
-        /// Test aims:
-        ///     - Ensure that the decorators are correctly read and grouping is done correctly 
-        /// </summary>
-        [Test]
-        public void TestsWithDecorators()
-        {
-            TestFramework expected = new TestFrameworkBuilder(Source, "Sample", 1).
-                TestSuite("Suite1", 2, new SourceFileInfo(@"c:\boostunittest\boostunittestsample.cpp", 11)).
-                    TestCase("MyBoost_Test1", 65536, new SourceFileInfo(@"c:\boostunittest\boostunittestsample.cpp", 12)).
-                    TestCase("MyBoost_Test2", 65537, new SourceFileInfo(@"c:\boostunittest\boostunittestsample.cpp", 16), null, false).
-                    TestCase("MyBoost_Test3", 65538, new SourceFileInfo(@"c:\boostunittest\boostunittestsample.cpp", 20)).
-                    TestCase("MyBoost_Test4", 65539, new SourceFileInfo(@"c:\boostunittest\boostunittestsample.cpp", 24), null, false).
-                EndSuite().
-                TestCase("MyBoost_Test5", 65540, new SourceFileInfo(@"c:\boostunittest\boostunittestsample.cpp", 30)).
-                TestCase("MyBoost_Test6", 65541, new SourceFileInfo(@"c:\boostunittest\boostunittestsample.cpp", 34), null, false).
-                TestCase("MyBoost_Test7", 65542, new SourceFileInfo(@"c:\boostunittest\boostunittestsample.cpp", 38)).
-                TestCase("MyBoost_Test8", 65543, new SourceFileInfo(@"c:\boostunittest\boostunittestsample.cpp", 42), null, false).
-            Build();
-
-            Compare("BoostTestAdapterNunit.Resources.ListContentDOT.test_list_content.gv", expected);
-        }
-    }
+// (C) Copyright ETAS 2015.
+// 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)
+
+using BoostTestAdapter.Utility;
+using BoostTestAdapter.Boost.Test;
+
+using BoostTestAdapterNunit.Utility;
+
+using NUnit.Framework;
+
+namespace BoostTestAdapterNunit
+{
+    [TestFixture]
+    public class DOTDeserialisationTest
+    {
+        #region Test Data
+
+        /// <summary>
+        /// Default source identifier for test purposes
+        /// </summary>
+        private static string Source
+        {
+            get
+            {
+                return "source.exe";
+            }
+        }
+
+        #endregion Test Data
+
+        #region Helper Methods
+
+        /// <summary>
+        /// Compares a test framework deserialised from the provided embedded resource against the expected one
+        /// </summary>
+        /// <param name="resource">Path to an embedded resource which is to be treated as input for TestFramework deserialisation</param>
+        /// <param name="expected">The TestFramework which the deserialised version should be compared against</param>
+        private void Compare(string resource, TestFramework expected)
+        {
+            using (var stream = TestHelper.LoadEmbeddedResource(resource))
+            {
+                TestFrameworkDOTDeserialiser parser = new TestFrameworkDOTDeserialiser(Source);
+                TestFramework framework = parser.Deserialise(stream);
+
+                FrameworkEqualityVisitor.IsEqualTo(framework, expected, false);
+            }
+        }
+
+        #endregion Helper Methods
+
+        /// <summary>
+        /// Deserialisation of (relatively large) Boost Test DOT content containing most features
+        /// 
+        /// Test aims:
+        ///     - Ensure that a TestFramework can be deserialised correctly from DOT content
+        /// </summary>
+        [Test]
+        public void DeserialiseDOT()
+        {
+            TestFramework expected = new TestFrameworkBuilder(Source, "sample", 1, false).
+                TestSuite("suite_1", 2, new SourceFileInfo(@"d:\sample.boostunittest\file_1.cpp", 6), false).
+                    TestSuite("suite_2", 3, new SourceFileInfo(@"d:\sample.boostunittest\file_1.cpp", 8), false).
+                        TestCase("test_3", 65536, new SourceFileInfo(@"d:\sample.boostunittest\file_1.cpp", 14), null, false).
+                        TestCase("test_4", 65537, new SourceFileInfo(@"d:\sample.boostunittest\file_1.cpp", 44), null, false).
+                        TestCase("test_5", 65538, new SourceFileInfo(@"d:\sample.boostunittest\file_1.cpp", 62), null, false).
+                    EndSuite().
+                    TestSuite("suite_6", 4, new SourceFileInfo(@"d:\sample.boostunittest\file_2.cpp", 19), false).
+                        TestCase("test_7", 65539, new SourceFileInfo(@"d:\sample.boostunittest\file_2.cpp", 24), null, false).
+                        TestCase("test_8", 65540, new SourceFileInfo(@"d:\sample.boostunittest\file_2.cpp", 40), null, false).
+                        TestCase("test_9", 65541, new SourceFileInfo(@"d:\sample.boostunittest\file_2.cpp", 90), null, false).
+                        TestCase("test_10", 65542, new SourceFileInfo(@"d:\sample.boostunittest\file_2.cpp", 105), null, false).
+                        TestCase("test_11", 65543, new SourceFileInfo(@"d:\sample.boostunittest\file_2.cpp", 121), null, false).
+                        TestCase("test_12", 65544, new SourceFileInfo(@"d:\sample.boostunittest\file_2.cpp", 134), null, false).
+                        TestCase("test_13", 65545, new SourceFileInfo(@"d:\sample.boostunittest\file_2.cpp", 310), null, false).
+                    EndSuite().
+                    TestSuite("suite_14", 5, new SourceFileInfo(@"d:\sample.boostunittest\file_3.cpp", 20), false).
+                        TestCase("test_15", 65546, new SourceFileInfo(@"d:\sample.boostunittest\file_3.cpp", 27), null, false).
+                        TestCase("test_16", 65547, new SourceFileInfo(@"d:\sample.boostunittest\file_3.cpp", 49), null, false).
+                        TestCase("test_17", 65548, new SourceFileInfo(@"d:\sample.boostunittest\file_3.cpp", 59), null, false).
+                        TestCase("test_18", 65549, new SourceFileInfo(@"d:\sample.boostunittest\file_3.cpp", 88), null, false).
+                    EndSuite().
+                    TestSuite("suite_19", 6, new SourceFileInfo(@"d:\sample.boostunittest\file_4.cpp", 7), false).
+                        TestCase("test_20", 65550, new SourceFileInfo(@"d:\sample.boostunittest\file_4.cpp", 12), null, false).
+                    EndSuite().
+                    TestSuite("suite_21", 7, new SourceFileInfo(@"d:\sample.boostunittest\file_5.cpp", 8), false).
+                        TestCase("test_22", 65551, new SourceFileInfo(@"d:\sample.boostunittest\file_5.cpp", 14), null, false).
+                    EndSuite().
+                    TestSuite("suite_23", 8, new SourceFileInfo(@"d:\sample.boostunittest\file_6.cpp", 13), false).
+                        TestCase("test_24", 65552, new SourceFileInfo(@"d:\sample.boostunittest\file_6.cpp", 18), null, false).
+                        TestCase("test_25", 65553, new SourceFileInfo(@"d:\sample.boostunittest\file_6.cpp", 28), null, false).
+                        TestCase("test_26", 65554, new SourceFileInfo(@"d:\sample.boostunittest\file_6.cpp", 38), null, false).
+                        TestCase("test_27", 65555, new SourceFileInfo(@"d:\sample.boostunittest\file_6.cpp", 48), null, false).
+                        TestCase("test_28", 65556, new SourceFileInfo(@"d:\sample.boostunittest\file_6.cpp", 59), null, false).
+                        TestCase("test_29", 65557, new SourceFileInfo(@"d:\sample.boostunittest\file_6.cpp", 70), null, false).
+                    EndSuite().
+                    TestSuite("suite_30", 9, new SourceFileInfo(@"d:\sample.boostunittest\file_7.cpp", 8), false).
+                        TestCase("test_31", 65558, new SourceFileInfo(@"d:\sample.boostunittest\file_7.cpp", 14), new[] { "hello", "world", "labels" }, false).
+                    EndSuite().
+                EndSuite().
+            Build();
+
+            Compare("BoostTestAdapterNunit.Resources.ListContentDOT.sample.list.content.gv", expected);
+        }
+
+        /// <summary>
+        /// Deserialisation of Boost Test DOT content consisting of the following scenario:
+        /// 
+        /// - Master Test Suite
+        /// -- Test Case
+        /// -- Test Suite
+        /// --- Test Case
+        /// -- Test Case
+        /// 
+        /// Test aims:
+        ///     - Ensure that a TestFramework can be deserialised correctly from DOT content
+        /// </summary>
+        [Test]
+        public void TestSuiteWithChildTestsAndSuites()
+        {
+            TestFramework expected = new TestFrameworkBuilder(Source, "MyTest", 1, false).
+                TestCase("Test", 65536, new SourceFileInfo(@"c:\boostunittest\boostunittestsample.cpp", 30),null, false).
+                TestSuite("Suite", 2, new SourceFileInfo(@"c:\boostunittest\boostunittestsample.cpp", 35), false).
+                    TestCase("Test", 65537, new SourceFileInfo(@"c:\boostunittest\boostunittestsample.cpp", 37), null, false).
+                EndSuite().
+                TestCase("TestB", 65538, new SourceFileInfo(@"c:\boostunittest\boostunittestsample.cpp", 44), null, false).
+            Build();
+
+            Compare("BoostTestAdapterNunit.Resources.ListContentDOT.sample.3.list.content.gv", expected);
+        }
+        
+        /// <summary>
+        /// Deserialisation of Boost Test DOT content consisting of test cases which are
+        /// explicitly enabled or disabled using boost decorators
+        /// 
+        /// Test aims:
+        ///     - Ensure that the decorators are correctly read and grouping is done correctly 
+        /// </summary>
+        [Test]
+        public void TestsWithDecorators()
+        {
+            TestFramework expected = new TestFrameworkBuilder(Source, "Sample", 1).
+                TestSuite("Suite1", 2, new SourceFileInfo(@"c:\boostunittest\boostunittestsample.cpp", 11)).
+                    TestCase("MyBoost_Test1", 65536, new SourceFileInfo(@"c:\boostunittest\boostunittestsample.cpp", 12)).
+                    TestCase("MyBoost_Test2", 65537, new SourceFileInfo(@"c:\boostunittest\boostunittestsample.cpp", 16), null, false).
+                    TestCase("MyBoost_Test3", 65538, new SourceFileInfo(@"c:\boostunittest\boostunittestsample.cpp", 20)).
+                    TestCase("MyBoost_Test4", 65539, new SourceFileInfo(@"c:\boostunittest\boostunittestsample.cpp", 24), null, false).
+                EndSuite().
+                TestCase("MyBoost_Test5", 65540, new SourceFileInfo(@"c:\boostunittest\boostunittestsample.cpp", 30)).
+                TestCase("MyBoost_Test6", 65541, new SourceFileInfo(@"c:\boostunittest\boostunittestsample.cpp", 34), null, false).
+                TestCase("MyBoost_Test7", 65542, new SourceFileInfo(@"c:\boostunittest\boostunittestsample.cpp", 38)).
+                TestCase("MyBoost_Test8", 65543, new SourceFileInfo(@"c:\boostunittest\boostunittestsample.cpp", 42), null, false).
+            Build();
+
+            Compare("BoostTestAdapterNunit.Resources.ListContentDOT.test_list_content.gv", expected);
+        }
+
+        /// <summary>
+        /// Assert that: It is possible to deserialize --list_content=DOT output consisting of a BOOST_DATA_TEST_CASE
+        /// </summary>
+        [Test]
+        public void DeserializeBoostDataTestCase()
+        {
+            TestFramework expected = new TestFrameworkBuilder(Source, "DataTestCaseExample", 1).
+                TestSuite("BoostUnitTest", 2, new SourceFileInfo(@"c:\boostunittest\boostunittestsample.cpp", 10)).
+                    TestCase("_0", 65536, new SourceFileInfo(@"c:\boostunittest\boostunittestsample.cpp", 10)).
+                    TestCase("_1", 65537, new SourceFileInfo(@"c:\boostunittest\boostunittestsample.cpp", 10)).
+                    TestCase("_2", 65538, new SourceFileInfo(@"c:\boostunittest\boostunittestsample.cpp", 10)).
+                    TestCase("_3", 65539, new SourceFileInfo(@"c:\boostunittest\boostunittestsample.cpp", 10)).
+                EndSuite().
+            Build();
+
+            Compare("BoostTestAdapterNunit.Resources.ListContentDOT.boost_data_test_case.gv", expected);
+        }
+    }
 }
\ No newline at end of file
diff --git a/BoostTestAdapterNunit/Resources/ListContentDOT/boost_data_test_case.gv b/BoostTestAdapterNunit/Resources/ListContentDOT/boost_data_test_case.gv
new file mode 100644
index 0000000..1a8a681
--- /dev/null
+++ b/BoostTestAdapterNunit/Resources/ListContentDOT/boost_data_test_case.gv
@@ -0,0 +1,17 @@
+digraph G {rankdir=LR;
+tu1[shape=ellipse,peripheries=2,fontname=Helvetica,color=green,label="DataTestCaseExample"];
+{
+tu2[shape=Mrecord,fontname=Helvetica,color=green,label="BoostUnitTest|c:\boostunittest\boostunittestsample.cpp(10)"];
+tu1 -> tu2;
+{
+tu65536[shape=Mrecord,fontname=Helvetica,color=green,label="_0|c:\boostunittest\boostunittestsample.cpp(10)"];
+tu2 -> tu65536;
+tu65537[shape=Mrecord,fontname=Helvetica,color=green,label="_1|c:\boostunittest\boostunittestsample.cpp(10)"];
+tu2 -> tu65537;
+tu65538[shape=Mrecord,fontname=Helvetica,color=green,label="_2|c:\boostunittest\boostunittestsample.cpp(10)"];
+tu2 -> tu65538;
+tu65539[shape=Mrecord,fontname=Helvetica,color=green,label="_3|c:\boostunittest\boostunittestsample.cpp(10)"];
+tu2 -> tu65539;
+}
+}
+}
diff --git a/BoostTestAdapterNunit/Utility/BoostTestLocator.cs b/BoostTestAdapterNunit/Utility/BoostTestLocator.cs
new file mode 100644
index 0000000..dcc0a9b
--- /dev/null
+++ b/BoostTestAdapterNunit/Utility/BoostTestLocator.cs
@@ -0,0 +1,105 @@
+// (C) Copyright ETAS 2015.
+// 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)
+
+using BoostTestAdapter.Boost.Test;
+
+namespace BoostTestAdapterNunit.Utility
+{
+    /// <summary>
+    /// ITestVisitor implementation which looks up test units based on their qualified name.
+    /// </summary>
+    public class BoostTestLocator : ITestVisitor
+    {
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="fullyQualifiedName">The test unit's fully qualified name to locate</param>
+        private BoostTestLocator(string fullyQualifiedName)
+        {
+            this.FullyQualifiedName = fullyQualifiedName;
+        }
+
+        /// <summary>
+        /// The fully qualified name of the test unit to locate
+        /// </summary>
+        public string FullyQualifiedName { get; private set; }
+
+        /// <summary>
+        /// The resultant test unit
+        /// </summary>
+        public TestUnit Unit { get; private set; }
+
+        #region ITestVisitor
+
+        public void Visit(TestCase testCase)
+        {
+            Check(testCase);
+        }
+
+        public void Visit(TestSuite testSuite)
+        {
+            if (!Check(testSuite))
+            {
+                foreach (TestUnit child in testSuite.Children)
+                {
+                    child.Apply(this);
+
+                    if (this.Unit != null)
+                    {
+                        break;
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Checks if the provided test unit is the one which was requested for location
+        /// </summary>
+        /// <param name="unit">The test unit to test</param>
+        /// <returns>true if the provided test unit was the one requested for location; false otherwise</returns>
+        private bool Check(TestUnit unit)
+        {
+            bool match = (unit.FullyQualifiedName == this.FullyQualifiedName);
+
+            if (match)
+            {
+                this.Unit = unit;
+            }
+
+            return match;
+        }
+
+        /// <summary>
+        /// Locates the test unit with the specified fully qualified name from the provided test framework
+        /// </summary>
+        /// <param name="root">The framework from which to locate the test unit</param>
+        /// <param name="fullyQualifiedName">The test unit's fully qualified name to locate</param>
+        /// <returns>The located test unit or null if it was not found</returns>
+        public static TestUnit Locate(TestFramework root, string fullyQualifiedName)
+        {
+            return Locate(root?.MasterTestSuite, fullyQualifiedName);
+        }
+
+        /// <summary>
+        /// Locates the test unit with the specified fully qualified name from the provided root
+        /// </summary>
+        /// <param name="root">The root test unit from which to locate the test unit</param>
+        /// <param name="fullyQualifiedName">The test unit's fully qualified name to locate</param>
+        /// <returns>The located test unit or null if it was not found</returns>
+        public static TestUnit Locate(TestUnit root, string fullyQualifiedName)
+        {
+            if (root == null)
+            {
+                return null;
+            }
+
+            var locator = new BoostTestLocator(fullyQualifiedName);
+            root.Apply(locator);
+            return locator.Unit;
+        }
+    }
+}
diff --git a/BoostTestAdapterNunit/VSDiscoveryVisitorTest.cs b/BoostTestAdapterNunit/VSDiscoveryVisitorTest.cs
new file mode 100644
index 0000000..4b4ae0f
--- /dev/null
+++ b/BoostTestAdapterNunit/VSDiscoveryVisitorTest.cs
@@ -0,0 +1,137 @@
+// (C) Copyright ETAS 2015.
+// 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)
+
+using System;
+using NUnit.Framework;
+
+using System.Linq;
+using System.Collections.Generic;
+
+using BoostTestAdapter;
+using BoostTestAdapter.Boost.Test;
+using BoostTestAdapter.Discoverers;
+using BoostTestAdapter.Utility;
+using BoostTestAdapter.Utility.VisualStudio;
+
+using BoostTestCase = BoostTestAdapter.Boost.Test.TestCase;
+using VSTestCase = Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase;
+
+using BoostTestAdapterNunit.Utility;
+
+namespace BoostTestAdapterNunit
+{
+    [TestFixture]
+    internal class VSDiscoveryVisitorTest
+    {
+        /// <summary>
+        /// Default test source file
+        /// </summary>
+        private const string _sourceFile = @"c:\test.cpp";
+        
+        /// <summary>
+        /// Creates a 'default' TestFrameworkBuilder instance for this TestFixture
+        /// </summary>
+        /// <returns>A 'default' TestFrameworkBuilder instance</returns>
+        private static TestFrameworkBuilder CreateFrameworkBuilder()
+        {
+            return new TestFrameworkBuilder("test.exe", "MyTest", 1);
+        }
+
+        /// <summary>
+        /// Discovers all tests cases enumerated within the provided framework
+        /// </summary>
+        /// <param name="framework">The framework to discover tests from</param>
+        /// <returns>An enumeration of all the discovered tests</returns>
+        private static IEnumerable<VSTestCase> Discover(TestFramework framework)
+        {
+            var sink = new DefaultTestCaseDiscoverySink();
+            var visitor = new VSDiscoveryVisitor(framework.Source, sink);
+            framework.MasterTestSuite.Apply(visitor);
+            return sink.Tests;
+        }
+
+        /// <summary>
+        /// Locates the test case with the provided fully qualified name from the provided framework
+        /// </summary>
+        /// <param name="framework">The framework to locate the test case from</param>
+        /// <param name="fullyQualifiedName">The test case fully qualified name to locate</param>
+        /// <returns>The located TestCase instance or null if it is not found</returns>
+        private static BoostTestCase LocateTestCase(TestFramework framework, string fullyQualifiedName)
+        {
+            var unit = BoostTestLocator.Locate(framework, fullyQualifiedName);
+            return unit as BoostTestCase;
+        }
+
+        /// <summary>
+        /// Asserts 'common' test case details between the test case encoded in the framework and the respective Visual Studio test case
+        /// </summary>
+        /// <param name="test">The Visual Studio TestCase instance to verify</param>
+        /// <param name="framework">The framework to locate the test case from</param>
+        /// <param name="fullyQualifiedName">The test case fully qualified name to locate</param>
+        private static void AssertCommonTestCaseDetails(VSTestCase test, TestFramework framework, string fullyQualifiedName)
+        {
+            Assert.That(framework, Is.Not.Null);
+
+            var expected = LocateTestCase(framework, fullyQualifiedName);
+
+            Assert.That(expected, Is.Not.Null);
+
+            AssertCommonTestCaseDetails(test, expected, framework.Source);
+        }
+
+        /// <summary>
+        /// Asserts 'common' test case details between the Boost test case and the respective Visual Studio test case
+        /// </summary>
+        /// <param name="test">The Visual Studio TestCase instance to verify</param>
+        /// <param name="expected">The Boost TestCase to which test should match to</param>
+        /// <param name="source">The source from which the Boost Test case was discovered from</param>
+        private static void AssertCommonTestCaseDetails(VSTestCase test, BoostTestCase expected, string source)
+        {
+            Assert.That(expected, Is.Not.Null);
+            Assert.That(test, Is.Not.Null);
+
+            Assert.That(test.Source, Is.EqualTo(source));
+            Assert.That(test.ExecutorUri, Is.EqualTo(new Uri(BoostTestExecutor.ExecutorUriString)));
+            Assert.That(test.FullyQualifiedName, Is.EqualTo(expected.FullyQualifiedName));
+
+            if (expected.Source != null)
+            {
+                Assert.That(test.CodeFilePath, Is.EqualTo(expected.Source.File));
+                Assert.That(test.LineNumber, Is.EqualTo(expected.Source.LineNumber));
+            }
+        }
+
+        /// <summary>
+        /// Assert that: Test display names for BOOST_DATA_TEST_CASE instances are different
+        ///              than the names determined by the Boost.Test framework
+        /// </summary>
+        [Test]
+        public void BoostDataTestCase()
+        {
+            TestFramework framework = CreateFrameworkBuilder().
+                TestSuite("DataTestCase", 2, new SourceFileInfo(_sourceFile, 10)).
+                    TestCase("_0", 65536, new SourceFileInfo(_sourceFile, 10)).
+                    TestCase("_1", 65537, new SourceFileInfo(_sourceFile, 10)).
+                    TestCase("_2", 65538, new SourceFileInfo(_sourceFile, 10)).
+                    TestCase("_3", 65539, new SourceFileInfo(_sourceFile, 10)).
+                EndSuite().
+                Build();
+
+            var tests = Discover(framework).OrderBy(test => test.FullyQualifiedName).ToList();
+
+            Assert.That(tests.Count, Is.EqualTo(4));
+
+            AssertCommonTestCaseDetails(tests[0], framework, "DataTestCase/_0");
+            AssertCommonTestCaseDetails(tests[1], framework, "DataTestCase/_1");
+            AssertCommonTestCaseDetails(tests[2], framework, "DataTestCase/_2");
+            AssertCommonTestCaseDetails(tests[3], framework, "DataTestCase/_3");
+
+            Assert.That(tests[0].DisplayName, Is.Not.EqualTo(LocateTestCase(framework, "DataTestCase/_0").Name));
+            Assert.That(tests[1].DisplayName, Is.Not.EqualTo(LocateTestCase(framework, "DataTestCase/_1").Name));
+            Assert.That(tests[2].DisplayName, Is.Not.EqualTo(LocateTestCase(framework, "DataTestCase/_2").Name));
+            Assert.That(tests[3].DisplayName, Is.Not.EqualTo(LocateTestCase(framework, "DataTestCase/_3").Name));
+        }
+    }
+}