Missed some cases where testFinished was needed.