[TASK] Extend unit tests to cover newly added code