A (hopefully) final restructuring of the test inputs.