Move blackbox tests closer to what they're testing.