Fixed licence header
Deleted alias branch
Fixed creation of exchange of type headers
Added more tests