changes from cctest