fixes #1300
fix tests
Merge branch 'master' of github.com:r888888888/danbooru