Further Testing

Yet more testing changes.