Refeactored wait, removed explicit reap, updated test-containerizer to follow updated scheme.