Added new helper class and first test case.