minor fixes for e2e capture test