fixed some errors stopping some tests.