Unit tests stopped working for some unknown reason; this commit allows them to pass again.