add test for _list operations
add test make file list
Skip the pwd in the dir listing
Merge in changes from server
Merge remote-tracking branch 'origin/master'