fix typo in solver_addbestrules
change infarch rule generation so that it does not break installed lock-steps
add lockstep testcases