Various cleanups

Running partest