Fix unittests

Cleanup after 5845a0ddd4bb6749a9d01a95b5417d43225e817f
Bump copyright year