pushd/popd perhaps

Also as you're touching this I'd love to be able to pass something to filter test_dirs so I can eg just run integration tests