Add testing and coverage