Improved data interface. Updated another test.

All 575u and applicable integration tests pass.