renamed package again, tried to make tests pass