fix uint and int distinction, more tests