updated tests & controller file