Fix failed test. Backward compatibility.
Fix failed unit test. Wrong indentation.