Unit tests fix