Fixed tests and indents