Refactoring

- Update unit tests
- Add final to all fields from constructor