Added helper classes for testing