Update Unit tests