[IMP] Correct indentation
[IMP] improve tests