Fix the indentation related test failures