minor refactorings

- add log message
- fix test name
- move class to it's own file, etc