small fixes
refactor test