Unit tests minor improvements