Change order so that TAP runner is last