moved functions in test folder and small cleaning