mod - more tests, cleanup, use changes_from_tree, rm sleep in test