Updated unit test