Began to fix testing, but haven't moved to temp directories everywhere yey