errors and augmented numerous tests to clean up properly.