Fix for indentation test failures