Outcommented some test code
Updated copyright years in comments