fixed unit tests and removed two that were serially failing