adding helper, tests
adding tests