Fix failing functional tests

These, to be specific: http://bamboo.s/browse/NX-DISTT-TLNX-403/

The problems were with the drilldown code, not the tests, so… yay!