borked
Add pkgtest header and tidy up copyright for upload