change: Improving unit tests