Simplify implementation and add initial int tests