Unit tests enhancement