Added Proper Unit Test