bug fixes plus test points added to folder entry test