More work on proxying strategy. More tests.