diff --git a/scripts/Tests/UnitTests/LineConveyor/test_macroResolver.py b/scripts/Tests/UnitTests/LineConveyor/test_macroResolver.py
index 019b5a1..3ac7f63 100644
--- a/scripts/Tests/UnitTests/LineConveyor/test_macroResolver.py
+++ b/scripts/Tests/UnitTests/LineConveyor/test_macroResolver.py
@@ -13,7 +13,10 @@ class TestMacroResolver(unittest.TestCase):
 		}
 
 		macroProcessor = MacroProcessor()
-		valueProvider = ValueProvider(config)
+
+		valueProvider = ValueProvider()
+		valueProvider.setConfig(config)
+
 		self.macroResolver = MacroResolver(macroProcessor, valueProvider)
 
 	def test_resolveLine(self):
diff --git a/scripts/Tests/UnitTests/Macro/test_macro.py b/scripts/Tests/UnitTests/Macro/test_macro.py
index dc89ac4..dd5c378 100644
--- a/scripts/Tests/UnitTests/Macro/test_macro.py
+++ b/scripts/Tests/UnitTests/Macro/test_macro.py
@@ -11,9 +11,9 @@ class TestMacro(unittest.TestCase):
 		symbols = self.macroParser.getSymbols(line)
 
 		self.assertEqual(3, len(symbols))
-		self.assertTrue('this' in symbols)
-		self.assertTrue('my_macro' in symbols)
-		self.assertTrue('macro_with_numbers123' in symbols)
+		self.assertTrue('@this' in symbols)
+		self.assertTrue('@my_macro' in symbols)
+		self.assertTrue('@macro_with_numbers123' in symbols)
 
 	def test_getName(self):
 		line = '{@macro_name}'
diff --git a/scripts/Tests/UnitTests/ProjectParser/test_projectParser.py b/scripts/Tests/UnitTests/ProjectParser/test_projectParser.py
index 33c6307..b1a6afe 100644
--- a/scripts/Tests/UnitTests/ProjectParser/test_projectParser.py
+++ b/scripts/Tests/UnitTests/ProjectParser/test_projectParser.py
@@ -7,7 +7,7 @@ from parser.InsideParser.InsideSetParser import InsideSetParser
 class TestCsprojParser(unittest.TestCase):
 
 	def setUp(self):
-		value_provider = ValueProvider({})
+		value_provider = ValueProvider()
 		self.parser = InsideSetParser(value_provider, 'csproj')
 
 
diff --git a/scripts/Tests/UnitTests/ValueProvider/test_valueProvider.py b/scripts/Tests/UnitTests/ValueProvider/test_valueProvider.py
index 6d0e2ae..0d13c69 100644
--- a/scripts/Tests/UnitTests/ValueProvider/test_valueProvider.py
+++ b/scripts/Tests/UnitTests/ValueProvider/test_valueProvider.py
@@ -8,7 +8,8 @@ class TestCase(unittest.TestCase):
 			'key1': 'value1',
 			'key2': 'value2'
 		}
-		self.__provider = ValueProvider(self.__config)
+		self.__provider = ValueProvider()
+		self.__provider.setConfig(self.__config)
 
 	def test_provideByLink(self):
 		value1 = self.__provider.getValueFor('@key1')