Ore Gen cleanup and test ore fix