Merge branch 'feature/c_tests'