Merge branch 'add_testing_framework_and_tests'