Small refactor. Some unit tests.