Improve tests after new documentation from Jonas