Reorganise to use hzy's runtests script