Indentation some tests enhanced