Added testing and coverage