fix tests and remove redundant param