SHDP-282 Tidy up localizer

- Further clean up
- Added tests for raw content