Update tests based on results of the 'whoosh' branch of Paperwork

Signed-off-by: Jerome Flesch <jflesch@gmail.com>