@derekchiang The test file are getting bigger. Can you try to separate these functions?