Minor changes to tree reading for TNTRunner in Zephyr