some changes with unit-tests files and helpers