Another fix to attempt to get the tests running