move drive selection to context
hack the tests to work a bit better