Added fixes + coverages for core