Update copyright date, use -present in Tests

Pushed to master