Added (and updated) unittests
Updated copyright on new files
Updated tabs -> spaces