FORGE-1502: Un-ignored test and fixed more ls issues