Completed coverage code; added Unit Tests for it.