Improve tests even more and fix problem with article generation