Updated Unit tests