Added functions to TopologyReader and relevant tests