rebuild and add util module's test code