tests refactored II
updated tests