updated tests & fixed name issue