Updated Unit Tests