Clean up whitespace/copyright/includes + minor test tweak.