Updates based on PR comments

-remove property
- added tests
- added licence header