Final revisions and testing