fix Integer handling
fix tests
fix Integer handling (II)
add assertion
add toyama to test suit