Fixes more indentation processing, test errors