added special case for plot tests and restart tests