Lots of cleanup and added live tests for forest attach/move operations