Add code coverage
Add more tests