Add tests
Increase coverage to 100%