BZ863 Test changes