Needs more int tests