Fix formatting
Fix tests