Merge branch 'unit-tests'