Fix indentations & tests