Merge branch 'hn/ref-api-tests-update'