Fix return type & test