2124: Fix is_original logic, add tests