Fix up unsplatting, add tests