Fix return types
Fix tests