Formatting
Fix tests