Finalized editing, tests