Fixed failing FolderTests - others still to do.