Fix tests and indentation