- Improve unit tests