Improve tests coverage

Solves #21