Changes made to ensure tests run