little closer
tests are almost passing
only one failing test
fix potential problem with undelete
refactor