tests refac and add 'tested' to functions tested