Code coverage

- Got code coverage to %100
- No external API changes
- Fixed one bug