Adding dev testing and coverage