1. update fetcher; 2. add tests