Added User story and adjusted tests