[#91] Tests and coverage