Add helper classes for testing - NOT FUNCTIONAL!