Added some new Helper classes with tests