[fix] short -> int
[enhancement] More tests