Add tests, now coverage is 100%
Remove un used method
Merge branch 'more-test'