Tests updated to new format.