Switched test content to new format