Test and tetra changes