Add metadata and testing cleanup.