Add unit and Integration test cases