Ported test fix from branch feature/tumblr-import