Resolved #2 Full coverage by tests