Add stricter types
Clean tests