Code review

- notes on naming unit tests
- code duplication