Adding new helper and test file