Adding/updating copyrights plus some unittests