added test support, fixed small bug with multidepth listing