refactor tests - step 1