Temporarily using my branch of etest for R16B compatibility