update the test helper
more good testing and refactoring and so on