Added tests for int/bool
Fixed bugs - tests now pass.