Add unit tests. Now 100% coverage