added verbose param, fixed tests