Add copyright and licence
Merge tests