remove unnecessary unittest class
Allow you to update/delete instances
update CHANGES
merge master in; fix some code