diff --git a/tests/TestCase.php b/tests/TestCase.php
index 871ee473d..baa002b3b 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -31,48 +31,60 @@ protected function getXdebugDataForBankAccount()
         return [
             [
                 TEST_FILES_PATH . 'BankAccount.php' => [
-                    8  => 1,
-                    9  => -2,
-                    13 => -1,
-                    14 => -1,
-                    15 => -1,
-                    16 => -1,
-                    18 => -1,
-                    22 => -1,
-                    24 => -1,
-                    25 => -2,
-                    29 => -1,
-                    31 => -1,
-                    32 => -2
+                    'lines' => [
+                        8  => 1,
+                        9  => -2,
+                        13 => -1,
+                        14 => -1,
+                        15 => -1,
+                        16 => -1,
+                        18 => -1,
+                        22 => -1,
+                        24 => -1,
+                        25 => -2,
+                        29 => -1,
+                        31 => -1,
+                        32 => -2,
+                    ],
+                    'functions' => []
                 ]
             ],
             [
                 TEST_FILES_PATH . 'BankAccount.php' => [
-                    8  => 1,
-                    13 => 1,
-                    16 => 1,
-                    29 => 1,
+                    'lines' => [
+                        8  => 1,
+                        13 => 1,
+                        16 => 1,
+                        29 => 1,
+                    ],
+                    'functions' => []
                 ]
             ],
             [
                 TEST_FILES_PATH . 'BankAccount.php' => [
-                    8  => 1,
-                    13 => 1,
-                    16 => 1,
-                    22 => 1,
+                    'lines' => [
+                        8  => 1,
+                        13 => 1,
+                        16 => 1,
+                        22 => 1,
+                    ],
+                    'functions' => []
                 ]
             ],
             [
                 TEST_FILES_PATH . 'BankAccount.php' => [
-                    8  => 1,
-                    13 => 1,
-                    14 => 1,
-                    15 => 1,
-                    18 => 1,
-                    22 => 1,
-                    24 => 1,
-                    29 => 1,
-                    31 => 1,
+                    'lines' => [
+                        8  => 1,
+                        13 => 1,
+                        14 => 1,
+                        15 => 1,
+                        18 => 1,
+                        22 => 1,
+                        24 => 1,
+                        29 => 1,
+                        31 => 1,
+                    ],
+                    'functions' => []
                 ]
             ]
         ];
@@ -234,32 +246,35 @@ protected function getExpectedDataArrayForBankAccount()
     {
         return [
             TEST_FILES_PATH . 'BankAccount.php' => [
-                8 => [
-                    0 => 'BankAccountTest::testBalanceIsInitiallyZero',
-                    1 => 'BankAccountTest::testDepositWithdrawMoney'
-                ],
-                9  => null,
-                13 => [],
-                14 => [],
-                15 => [],
-                16 => [],
-                18 => [],
-                22 => [
-                    0 => 'BankAccountTest::testBalanceCannotBecomeNegative2',
-                    1 => 'BankAccountTest::testDepositWithdrawMoney'
-                ],
-                24 => [
-                    0 => 'BankAccountTest::testDepositWithdrawMoney',
-                ],
-                25 => null,
-                29 => [
-                    0 => 'BankAccountTest::testBalanceCannotBecomeNegative',
-                    1 => 'BankAccountTest::testDepositWithdrawMoney'
+                'lines' => [
+                    8 => [
+                        0 => 'BankAccountTest::testBalanceIsInitiallyZero',
+                        1 => 'BankAccountTest::testDepositWithdrawMoney'
+                    ],
+                    9  => null,
+                    13 => [],
+                    14 => [],
+                    15 => [],
+                    16 => [],
+                    18 => [],
+                    22 => [
+                        0 => 'BankAccountTest::testBalanceCannotBecomeNegative2',
+                        1 => 'BankAccountTest::testDepositWithdrawMoney'
+                    ],
+                    24 => [
+                        0 => 'BankAccountTest::testDepositWithdrawMoney',
+                    ],
+                    25 => null,
+                    29 => [
+                        0 => 'BankAccountTest::testBalanceCannotBecomeNegative',
+                        1 => 'BankAccountTest::testDepositWithdrawMoney'
+                    ],
+                    31 => [
+                        0 => 'BankAccountTest::testDepositWithdrawMoney'
+                    ],
+                    32 => null
                 ],
-                31 => [
-                    0 => 'BankAccountTest::testDepositWithdrawMoney'
-                ],
-                32 => null
+                'functions' => []
             ]
         ];
     }
@@ -268,32 +283,35 @@ protected function getExpectedDataArrayForBankAccountInReverseOrder()
     {
         return [
             TEST_FILES_PATH . 'BankAccount.php' => [
-                8 => [
-                    0 => 'BankAccountTest::testDepositWithdrawMoney',
-                    1 => 'BankAccountTest::testBalanceIsInitiallyZero'
-                ],
-                9  => null,
-                13 => [],
-                14 => [],
-                15 => [],
-                16 => [],
-                18 => [],
-                22 => [
-                    0 => 'BankAccountTest::testBalanceCannotBecomeNegative2',
-                    1 => 'BankAccountTest::testDepositWithdrawMoney'
-                ],
-                24 => [
-                    0 => 'BankAccountTest::testDepositWithdrawMoney',
-                ],
-                25 => null,
-                29 => [
-                    0 => 'BankAccountTest::testDepositWithdrawMoney',
-                    1 => 'BankAccountTest::testBalanceCannotBecomeNegative'
+                'lines' => [
+                    8 => [
+                        0 => 'BankAccountTest::testDepositWithdrawMoney',
+                        1 => 'BankAccountTest::testBalanceIsInitiallyZero'
+                    ],
+                    9  => null,
+                    13 => [],
+                    14 => [],
+                    15 => [],
+                    16 => [],
+                    18 => [],
+                    22 => [
+                        0 => 'BankAccountTest::testBalanceCannotBecomeNegative2',
+                        1 => 'BankAccountTest::testDepositWithdrawMoney'
+                    ],
+                    24 => [
+                        0 => 'BankAccountTest::testDepositWithdrawMoney',
+                    ],
+                    25 => null,
+                    29 => [
+                        0 => 'BankAccountTest::testDepositWithdrawMoney',
+                        1 => 'BankAccountTest::testBalanceCannotBecomeNegative'
+                    ],
+                    31 => [
+                        0 => 'BankAccountTest::testDepositWithdrawMoney'
+                    ],
+                    32 => null
                 ],
-                31 => [
-                    0 => 'BankAccountTest::testDepositWithdrawMoney'
-                ],
-                32 => null
+                'functions' => []
             ]
         ];
     }
@@ -323,10 +341,13 @@ protected function setUpXdebugStubForFileWithIgnoredLines()
             ->will($this->returnValue(
                 [
                     TEST_FILES_PATH . 'source_with_ignore.php' => [
-                        2 => 1,
-                        4 => -1,
-                        6 => -1,
-                        7 => 1
+                        'lines' => [
+                            2 => 1,
+                            4 => -1,
+                            6 => -1,
+                            7 => 1
+                        ],
+                        'functions' => []
                     ]
                 ]
             ));
@@ -359,15 +380,18 @@ protected function setUpXdebugStubForClassWithAnonymousFunction()
             ->will($this->returnValue(
                 [
                     TEST_FILES_PATH . 'source_with_class_and_anonymous_function.php' => [
-                        7  => 1,
-                        9  => 1,
-                        10 => -1,
-                        11 => 1,
-                        12 => 1,
-                        13 => 1,
-                        14 => 1,
-                        17 => 1,
-                        18 => 1
+                        'files' => [
+                            7  => 1,
+                            9  => 1,
+                            10 => -1,
+                            11 => 1,
+                            12 => 1,
+                            13 => 1,
+                            14 => 1,
+                            17 => 1,
+                            18 => 1
+                        ],
+                        'functions' => []
                     ]
                 ]
             ));