AdrianH: test manager improvements