Unit tests minor fixes