Updated Unit Test