Fixes indentation processing, test errors