complete rewrite of dir list tests