TEST upgrade