Refactor splatter
Add validation happy path spec