simplify authorship, fix entity, tests