See previous patch descriptions for the motivation. The tests reflect the current state of the world -- as we add support we'll see changes in the test output.