Fixed tests to work with new API
Added copyright info to two missed files