Added unit test and add setChangeed