Fix for failed builds in Jenkins

This change fixes the failed builds currently happening in Jenkins.

I forgot to update the unit tests to account for the changes from #737 and #864.