Various fixes to Testing and Goodie files, mostly switched to canoncial header format and spacing