1.1 test improvements

A first pass of updated delegation and improved tests.