HV-788 Upgrading to BV API and TCK final