Added Additional Checks for corner cases for #17

Corner cases when the state is not changed. will ensure to pass certification