Move a method to TestHelper
Add tests