Updating existing tests to match 1.x spec.