Fix indentation
Fix tests