Add numeric list #20
Fix tests