Fixed cleanup problems in e2e-test.sh