Updating article query and fixing unit test