diff --git a/conformance_test/core_language_tests/negative_tests/run_test_all b/conformance_test/core_language_tests/negative_tests/run_test_all
index 9d2e799ee18b3c7e0399f2b1dccc82d6b1ae9c3c..44552c41318295a0c3a873d99b5e686f16c072ba 100755
--- a/conformance_test/core_language_tests/negative_tests/run_test_all
+++ b/conformance_test/core_language_tests/negative_tests/run_test_all
@@ -12,5 +12,5 @@ done
 echo "Batch execution of SA tests: creating 1 report for each script file"
 echo "You must have a symlink in this directory named perl and pointing to perl 5.6.0 or higher"
 
-echo "./perl ../Tools/SAtester.pl $SCRIPTFLAGS -log SA_log.report *.script"
-./perl ../../function_test/Tools/SAtester.pl $SCRIPTFLAGS -log SA_log.report *.script
+echo "./perl ../../Tools/SAtester.pl $SCRIPTFLAGS -log SA_log.report *.script"
+./perl ../../../function_test/Tools/SAtester.pl $SCRIPTFLAGS -log SA_log.report *.script
diff --git a/conformance_test/core_language_tests/positive_tests/README.txt~ b/conformance_test/core_language_tests/positive_tests/README.txt~
deleted file mode 100644
index 2eb277e246e13604a01029ff68e567e49538909e..0000000000000000000000000000000000000000
--- a/conformance_test/core_language_tests/positive_tests/README.txt~
+++ /dev/null
@@ -1,17 +0,0 @@
-// README to positive conformance tests
-
-How to run:
-A. 
-1. Create bin folder in positive_tests and copy XML_tests.cfg into it
-2. Use the Makefile in positive tests folder
-
-B. (Without the Makefile)
-1. Generate a Makefile from pos_conf_test.tpd in positive_tests folder:
-		ttcn3_makefilegen -f -t pos_conf_tests.tpd
-2. Create bin folder in positive_tests and copy XML_tests.cfg into it
-3. Compile Makefile in bin folder:
-		make
-4. Run tests in bin folder:
-		ttcn3_start pos_conf_tests
-5. Clean everything in bin folder:
-		make clean
diff --git a/conformance_test/xml_tests/negative_test/README.txt~ b/conformance_test/xml_tests/negative_test/README.txt~
deleted file mode 100644
index f146a5b707916f5a06d007a87fb6bd7920d7ebcc..0000000000000000000000000000000000000000
--- a/conformance_test/xml_tests/negative_test/README.txt~
+++ /dev/null
@@ -1,11 +0,0 @@
-// README to negative xml conformance tests
-
-How to run:
-	./SAtester_XML.pl neg_xml_tests.script
-
-IMPORTANT:
-UsefulTtcn3Types.txt and XSD.txt are needed for running
-xsd_tmp_keyword and usefultypes_tmp_keyword are changed for these files durring running
-
-neg_tc_sample is a sample format for tests in neg_xml_tests.script
- 
diff --git a/conformance_test/xml_tests/positive_tests/README.txt~ b/conformance_test/xml_tests/positive_tests/README.txt~
deleted file mode 100644
index 91e9eb4fe23297e0b741f68b1da1edfb78fd064e..0000000000000000000000000000000000000000
--- a/conformance_test/xml_tests/positive_tests/README.txt~
+++ /dev/null
@@ -1,17 +0,0 @@
-// README to positive conformance tests
-
-How to run:
-A. 
-1. Create bin folder in positive_tests and copy XML_tests.cfg into it
-2. Use the Makefile in positive tests folder
- 
-B. (Without the Makefile) 
-1. Generate a Makefile from XML_tests.tpd in positive_tests folder:
-		ttcn3_makefilegen -f -t XML_tests.tpd
-2. Create bin folder in positive_tests and copy XML_tests.cfg into it
-3. Compile Makefile in bin folder:
-		make
-4. Run tests in bin folder:
-		ttcn3_start XML_tests XML_tests.cfg
-5. Clean everything in bin folder:
-		make clean
diff --git a/usrguide/SoC_TITAN.docx b/usrguide/SoC_TITAN.docx
index 2aea5255ff0dffa105974a9d89d5982d2efa2f26..8440f723587ff955bc3f02c08563384533892b51 100644
Binary files a/usrguide/SoC_TITAN.docx and b/usrguide/SoC_TITAN.docx differ