Modified test data to conform to desired convention-based API. Many new test failures. ;-)