Merge branch 'dev_tests_using_scons'