Added more test cases
Refactored change monitor and added test case