Added unit-tests for helper classes