- Initial implementation
- Adjust test expectancies
- Add new tests