Fixed broken tests and test initializations.