Implement unset, fixes, updates, new tests