errors fixed with test codes update1