WIP: move partest out