Merge rv32ua tests into rv64ua