Merge of #164433106-setup_unit_test_framework_and_write_some_simple_tests to master