Allow reap in any state
Fixed unit tests
Updated todos