More unit testing added and coverage added