added TestGeometry and UNDEFs