Updated testmap model