Simple test, plus changed headers of most files.