SI-6939 Minor tweaks per review

- Hiding newly added methods as private
- A few more tests