move some variables into strategy
fix tests halting