Fixing more tests and indentation.