COMP: Add test for origin writing fix