[WIP] Coverage increase (close #30)