refactoring on testhelper project