Added copyright header to files missing it.
Removed DF keys from test files.
Reorganized the code a tad.