prep for v1
reorder tests