Fix for testing in preparation for CI