Fix tests, style