upgrade test libs
refactor, make passing of arguments more sence