o Fixed a timing/threading issue in --test